IDEA implements SVN to create branches and merge branches

Copyright statement: This article is the original article of the blogger and may not be reproduced without the permission of the blogger. https://blog.csdn.net/liyanlei5858/article/details/81746545

One, create a branch

1. The main version SVN directory structure

2. Create a branch in IDEA

Pop-up confirmation box

Click Yes, the branch is created successfully!

3. The branch version SVN directory structure

Two, switch branches in IDEA

1. Configure Branches

If there is no selectable branch, you need to configure the branch first

Version configuration popup

Cancel permission configuration

Edit branch address

Load the corresponding directory

Add branch completed

2. Switch to the designated branch

Click OK to complete the version switch.

Three, merge branches

Target: v816 version merged into trunk version.

1. Make sure or switch to the trunk branch, see the second switch branch above.

2. Merge the v816 version to the trunk

version control—->subversion working copied information—>merge from—–>Configure the branch address—->Select merge all
svn to automatically filter out the version that this branch does not have, or you can choose manually select quick, but it is recommended merge all, because this svn will automatically filter out the branches that are not merged.

Select branch

merge all

If there is a conflict, a list of conflicting files will pop up. Click each file to resolve the conflict. If there are no conflicts, wait for a while to complete the merge!