Our method for merging branches back to trunk:
branch> svn merge from trunk [rev_last_merged_from_trunk]:[HEAD]
branch> (resolve conflicts, deploy, test)
branch> commit
(at this point, the branch should be exactly what trunk has plus all changes done in the branch)
trunk> svn merge from branch [rev_first_branched_from_trunk]:[HEAD]
For some reason svn still sees a ton of conflicts when doing that last step. In the past I would have to manually go through each file and just copy what was in the branch on top of trunk and then “mark resolved”. However, now there is a faster way: Using at least SVN v1.5 at command line:
svn resolve -R --accept theirs-full
Thats it! Its a life saver. Or at least a time saver.
(This can be dangerous. Make sure you have resolved all true conflicts in the branch before doing the “resolve all”)
No comments:
Post a Comment