The SVN branch in Eclipse is merged into the trunk

In project development, you need to add some new functionality, but do not want to affect the project progress of other developers, so decided to use the SVN branch for development, and then merge the branch into the trunk. This article describes how to merge branches into the trunk in eclipse.

1. To merge branches into the trunk, you first need to switch to the trunk.

Right-click on the item, select team-switch, and the URL address is the trunk access path.

2. Right-click on the item, select Merge, and select "Merge different Trees".

3. In the following screen, select the following:

The from path fills in the trunk's access path. In the following version selection, you can select Head Revision (the latest version of the trunk), or specify a different version.

The path to is the access path to the branch. You can select Head Revision (the latest version of the branch) in the version selection, or specify a different version.

When you click Finish, the merge operation is performed.

4. Resolve the conflict and submit it to the trunk.

When the merge is complete, the branches and trunk files are merged. If a file is modified at the same time in the branch and trunk, a conflict may occur and the file needs to be manually updated to resolve the conflict. When all conflicts are resolved, you need to commit the changes to the trunk so that the branch merge is complete. The branch can remain in SVN and can be deleted if it is not required.

The SVN branch in Eclipse is merged into the trunk