Integrated SVN MAVEN Development manual---merge backbone in eclipse

After the code commits the branch

Right-click Project, switch to trunk version

After switching back to the trunk version:

Update skeleton version

Merge

Select Merge a range of revisions, click Next

Enter the path of the branch version to be merged. The Select cannot choose The path of the branches, the reason is not yet clear. If you can't choose, you can enter it manually,next

Finish

After merging. Will indicate the number of files in this merge, and merge the results, confirm the error, click OK.

At this point the branch version has been submitted to the local backbone version,

After confirming that there is no conflict, right-click the project and submit it

Submit a skeleton version, remember to write good comments, convenient for later code maintenance.

The corresponding merge, the submit operation will be prompted in the Eclipse console.

Integrated SVN MAVEN Development manual---merge backbone in eclipse