Idea completes the merging of branches and trunks

When we are developing a project, we may create a branch and a trunk. For the branch, we generally may use in the development time, but when the project is on-line, the address of the project we extract may be the SVN address of the trunk, then we need to merge the SVN code on the branch into the trunk, then we need to compare the branch and the trunk.

The question is, how do we use idea, compare the code on the branch with the trunk, and merge the modified code on top of the trunk.

For details, please see the following explanation ~

First click on the contents of the red box below:

、

Next, enter the following two items in the interface box, corresponding to the trunk and branch of the comparison, and tick on the try merge, as shown in:

Finally click OK to complete the branch and trunk of the code comparison, the specific changes as shown in the following:

OK, at this time, understand the branch and trunk code changes, then the branch above the code to merge into the trunk can be ~ ha

Idea completes the merging of branches and trunks