svn tutorial

http://wenku.baidu.com/link?url=RXLRjrTbSDn0q1pMM_UcS35mMaN6oSzpW8DJ7FJ0JYZMTq0XDBRc9NhNmeGKyj_Y_YQ7leRDXGje9V1d0SGVE8OKy2fNgMPSnbA8jqYEUr7   page 49

http://www.cnblogs.com/wenlong/archive/2012/05/07/2586853.html   very good merge two different trees

http ://blog.csdn.net/knighttools/article/details/40425569   Merge tool

http://www.cnblogs.com/coding-my-life/p/3702407.html

http://blog.csdn.net/u011244446 / article / details / 53637092   examples

http://wenku.baidu.com/link?url=81wSzQWboOxku12ZG3SmYXkD9XXRawRGHgSIVV7MJp-RByVGvlm1XvRRY2UyZzEQjutmHw-THZwpREjXOkbNS4-T9899NoTncE0z5ehH2fq   ultra-detailed

http://wenku.baidu.com/link?url=DiI-0pscn0305iJW4s3QbvaaCxc0hUQc-j8ef2Nwy9BbBotg0_fhVxnWb9gBr6HhGsg2kvM7sHxCJuxsMWLbM8GFcuBlHZuDxMvnTWXO4KC

http://blog.csdn.net/bbirdsky/article/details/24620155

http://welcome66.iteye.com/blog/1913597
1) Merge from trunk to branch
2) Merge from branch to trunk
3) Merge from trunk Modify merge into branch
4) Merge 2 branches into trunk
5) From trunk to branch, manually specify the modifications that do not need to be merged
6) From trunk to branch, manually specify the modifications to be merged


http://wenku.baidu.com/view /6fbed13abe23482fb4da4cc3.html?from=search
SVN version branch creation and branch merging under Eclipse


http://blog.csdn.net/han_dongwei/article/details/7754328
First, merge a range of versions
    This type is the most widely used, mainly to combine Changes in the branch are merged into the trunk. Right-click on the trunk and select Merge, then select Merge Type: Merge a Range of Versions.
The merged source URL is filled with the URL of the branch to be merged. If the version range to be merged is empty, it refers to all the versions on the merged branch, that is, all the evolutions since the branch was created to the current latest version of the branch. If only one version or several versions are selected, it means that the changes of the n versions are only merged into the trunk. If only one version is selected, it means that only the modification of that version is selected, and the modification before or after will not be adopted.

The revival of mergers
    The revival merge can be understood as a special case of the first merge type. In the revival merge, the trunk can be understood as having no modification since the branch was created, and the branch has been modified, and the branch has no version selection in the merge. . After a revival merge, all the changes in the branch will be merged into the trunk, and the result of the merge will make the branch exactly the same as the trunk, so that the branch can be deleted.

3. Merge two different trees
    This type is different from the first two types. The first type can select the version of the branch merge, but the trunk cannot select the version; the second type is that neither the trunk nor the branch can select the merged version; and this The type is a version that can be selected for merging whether it is the trunk or the branch, that is, a version of the trunk in the past can be selected to merge with a version of the branch. When merging, the selected branch version is the main one. If the selected trunk version is different from the branch version, the trunk part will be discarded when merging.
Start URL: Select the URL of the trunk directory (should be the same as the URL of the current working copy, this is the so-called merge point)
End URL: Select the URL of the branch to be merged.
Starting and ending versions: Generally, the starting version should find the version at the time of the last synchronization. If it has never been synchronized (the first merge), select the version when the branch was created. The ending version is generally the latest version. If you do not want to You can also choose a merge point when merging something into the trunk.


http://blog.csdn.net/wjtxt/article/details/8623262
1. Merge a range of revesions
to apply some changes on a branch to the local working copy.
branch_remote is manually selected by the user, and branch_remote_actions are generated by comparing multiple sets of TO and FROM versions (versions manually selected by the user).

2. Reintergrate a branch
Applies all changes on a branch to the local working copy.
branch_remote is manually selected by the user, then TO is branch_remote: HEAD, and FROM is base_line: ver_base

3. Merge two different trees
applies the manually specified differences between the FROM and TO version trees to the local working copy.
Both TO and FROM are manually selected by the user, and branch_remote_actions are generated by comparing the TO and FROM versions. When TARGET and FROM are the same branch, ver_base is equal to
FROM.