Shulou(Shulou.com)06/01 Report--

This article is about how to implement SVN to create branches, merge branches and switch branches under Eclipse. The editor thinks it is very practical, so share it with you as a reference and follow the editor to have a look.

1. Create a branch

Right-click on the project name, pop-up menu, select "Team", and then select "Branch/Tag" to pop up the following page:

The "Copy to URL" in the figure above fills in the path address to create the new branch, and then copy the program to that directory to form a new branch. Click "Next":

Select the latest version and click "Next"

If the program project of switch working copy to new branch/tag,eclipse below is checked, it will automatically switch to the branch. We don't choose here. We'll switch it later.

This creates a 1.0 branch

two。 Handover

You can merge from the trunk to the branch or from the branch to the backbone, and you can select the appropriate options as needed, as shown in the following figure:

The options in the figure above:

1) merge from trunk to branch

2) merge from branch to backbone

3) merge the changes on the trunk into the branch

4) merge 2 branches into the backbone

5) from trunk to branch, manually specify changes that do not need to be merged

6) manually specify the changes to be merged from trunk to branch

What I use is: merge 2 branches into the trunk

The image above shows that there are no changes, so there is no need to merge. If you make changes, select "Next" and the following image will appear.

The picture above is the most critical step: I think merging is actually overwriting the contents of one branch to another.

As shown in the figure, 106 and 107 are branches based on 1.1.1. The version number of 106 is 130, and the version number of 107 is 131.

After the developer submitted, the version number of 106 became 266, and the version number of 107 became 302. Now we want to put the branch of 106

Overwrite 107, but if 107 also makes changes, it needs to be reserved and cannot be overwritten, and the same file needs to resolve conflicts manually.

We need to put 107 in the address bar above, and then select the original version number 131 (which should show 132).

3. Handover

Right click on the project name and select "Team"-> "switch to another Branch/Tag/Revision".

Select the destination address that needs to be switched, and click ok.

In this way, you can switch arbitrarily between the trunk and several branches in the project to modify and submit different versions / branches of the program.

Thank you for reading! On "how to achieve SVN under Eclipse to create branches and merge branches, switch branches" this article is shared here, I hope the above content can be of some help to you, so that you can learn more knowledge, if you think the article is good, you can share it out for more people to see it!

Welcome to subscribe "Shulou Technology Information " to get latest news, interesting things and hot topics in the IT industry, and controls the hottest and latest Internet news, technology news and IT industry trends.