Thursday, April 19, 2012

svn: making trunk identical to a branch

So, I created a branch, made changes within the branch over a period and periodically kept merging from trunk into the branch. 

Now I want to make the trunk identical to the branch. The best approach for this is as described at, namely use the three-way merge option: want to merge "FROM trunk@HEAD TO branch@HEAD" with the working copy pointing to trunk. In essence:
"Give me all the changes I'd need to make trunk identical to branch".

No comments: