This week's book giveaway is in the OO, Patterns, UML and Refactoring forum. We're giving away four copies of Refactoring for Software Design Smells: Managing Technical Debt and have Girish Suryanarayana, Ganesh Samarthyam & Tushar Sharma on-line! See this thread for details.
I initially had my base branch.
I made 2 identical branches from it i.e. Branch 1 and Branch 2.
2 independent teams are making changes to Branch1 and Branch2,
Now I want to integrate the code changes made in Branch1 and Branch2 into a singe working copy. Identical file might have been modified in both branches.
Can this be achieved. I am currently using the following client.
I seconds Tim's waryness! Merging is a *itch, especially if you have two teams making independent changes to the same source base. A "svn merge" will only do so much, and you will have to manually resolve any conflicts. I hope you have really good unit and integration tests!
I would run a "svn diff" first. Or I would check out both branches and use some tool such as windiff, ediff or SynchronizeIt to view the differences. I would also compare the branches against the original. All of this comparing would help me better plan for the merging of the branches - I would at least know which files were going to cause me the most problems. It is hard to give specific steps because it all really depends on what was changed.