eclipse SVN branch merged into trunk, trunk merged into branch
A very simple question, many articles on the Internet have been written and copied, and they are all wrong! ! ! !
The reason for splitting trunks and branches
a. The trunk version is the stable version
b. When developing, all develop on the branch
c. After the development is completed, it is merged into the trunk and released
1. Merge the branch to the trunk
- First, submit the modified content of the branch to your own branch
- Then switch the project to the trunk
- Right-click merge on the switched project (at this time, you can see that it has been switched to the trunk in eclipse)
- Select the path of the branch, select the header of the branch
- Click for next step
- Commit the updated files from the branch merged into the trunk into the trunk
Screenshot of Notes
- Select the version of the branch
- Select the revision range (that is, the revision)
- select a revision
2. Merge trunk to branch
- Submit the modified content on the trunk
- switch project to branch
- Right-click merge on the switched project (at this time, in eclipse, you can see that it has been switched to the trunk)
- Select the trunk version
The precautions are the same as above, just choose the trunk version