SVN merges the trunk code into the branch

Source: http://blog.csdn.net/u012701023/article/details/50978154

Problem: Development has a project backbone, again on the basis of a branch, the development of new functions, because the business needs, in the last branch is still in the testing phase, and the trunk has not been merged;

But the new business is in a hurry to develop, but also on the basis of the last branch of another branch

So we're going to have a problem. When merging code, there will be a lot of conflicts, we need to modify the previous version of the bug on the trunk to develop new features on the current version

This is when merging code conflicts is inevitable. The team has more developers

Functional development Complete the merge code is also a very painful thing

Workaround:

Merge the trunk code into the branch so that the functionality is very simple to work with to complete the merge code.

Select one of the branches Compare select the current branch is the branch that is now being developed

Against select trunk we want to merge the files

So we can merge some of our own code into the branch.

This solves the conflict of the last merge code

But SVN has one drawback: if there is a conflict when the xib merge, then we need to manually merge.

　　

SVN merges the trunk code into the branch