iniside Posted August 12, 2020 Report Share Posted August 12, 2020 I might be doing it wrong but.. Here is my setup. I Have single /main branch where I keep game engine files. I have child branch /main/Projects - here I keep engine level plugins, which do not belong to vanillia engine, but I want to share for every project. At least I have /main/Projects/ProjectName - branch specific per project. Now I created another branch from /main/Projects/ProjectName/Engine-Plugin-Refactor I made some changes to plugins shared across all game projects. I want it to merge back to /main/Projects. But when trying merge to - it also wants to merge all the game project files, which is not something I want. Is there way to merge only the files I want, back to /main/Projects ? Or is there some branching setup which would allow me to do it ? The one work around I have for now is to force conflict on folders I don't want to merge, while not perfect it somewhat works. Link to comment Share on other sites More sharing options...
calbzam Posted August 12, 2020 Report Share Posted August 12, 2020 Hi, I think what you are asking is the chery-pick operation: https://www.plasticscm.com/documentation/advanced-version-control-guide#cherry-pick Please let us knownif it helps. Regards, Carlos. Link to comment Share on other sites More sharing options...
iniside Posted August 12, 2020 Author Report Share Posted August 12, 2020 Hey Aftering looking at it again it might work. I just miss understood how it works. it's Cherry pick from.. while (to the branch I'm currently on), while for some reason I thought it will always from bottom up. It seems it work now. Though it will be nice to also have similiar option like cherry pick to. Link to comment Share on other sites More sharing options...
Recommended Posts
Create an account or sign in to comment
You need to be a member in order to leave a comment
Create an account
Sign up for a new account in our community. It's easy!
Register a new accountSign in
Already have an account? Sign in here.
Sign In Now