Eclipse SVN Trunk-Branch code Merge

1. Branching on trunk: right-→team→branch/tag fill in the path name of the branch you want to create. And then all the way next.

2. Switch to your own branch for code writing: Right-click →team→other Branch

3. At this point the code on the main line is updated and the code for the main line needs to be merged:
   Right-click →team→merge
   Select Reintegrate a branch
   Merge from select the path of the trunk
   The default selection, after finish, SVN automatically merges the code and retains the code that is conflicting.

4. After the merge skeleton code is finished, the local code and the branch code need to be concurrently manipulated. Right-→team→ the same time, and then commits the latest code to its own branch, which completes the merging of the skeleton code.
   
   

5. Merging the branch code on the trunk is the same, except that the path selected from the merge from is the path of the branch.

before we found the method above, we tried to replace the merge operation with the replace operation, resulting in a large fork. Note that the Replace operation replaces the server address information that belongs to the Replace file, such as the file on the branch where a file is replaced by the trunk, and the file on the branch actually corresponds to the trunk file. Rather than the file of your own branch

When you compare this with the trunk, you will find that even if you have modified the file, the result is always the same as the skeleton file.

Extended Reading

http://blog.csdn.net/zhangskd/article/details/7742923

Eclipse SVN Trunk-Branch code Merge