Konstantin Posted January 16, 2014 Report Share Posted January 16, 2014 Hello! I have a Unity3d project. The same project is used to build game client and dedicated server. These builds share 99% of files, but some are different. Right now I have two main branches: /client and /server. This works fine with files that are same in both branches. I update one branch and merge to the other. However if I change files that should be different, merge UI does not allow me to exclude them from merge, it says that merge link does not allow that. I can make some sort of merge using shelves (this drops the merge link and I can choose files to check-in). Am I doing this right at all? What is the recommended way? Link to comment Share on other sites More sharing options...
calbzam Posted January 16, 2014 Report Share Posted January 16, 2014 Hi, Why don´t you use different repositories and then link them using Xlinks? http://codicesoftware.blogspot.com/2011/12/how-to-link-repositories-using-xlinks.html Anyway, when you perform a merge, you can select the changesets to merge (not necessary all the changesets in the branch). We call this operation cherripick. Regards, Carlos Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.