SVN trunk and branch merge

1. Create a new project under the svn repository with the following structure:
–project(project name)
–trunks(trunk,)
–branches(branch)
–tags(tag)
2. Merge the trunk content into the branch: (The branch needs to be changed, then right-click the branch To merge)
select the branch directory, select merge, merge two different trees, start (from), select the url of the directory or file that needs to be changed in the current directory, end (to), select the url of the trunk directory or file , which will be executed by default in the future.

3. Merge the contents of the branch to the trunk: (the trunk needs to be changed, right-click the trunk, and then merge)
Select the trunk directory, select merge, merge two different trees, from the start (from), select the directory that needs to be changed in the current directory or The url of the file, at the end (to), select the url of the branch directory or file, which will be executed by default in the future.

Reference documents: http://www.cnblogs.com/ym123/p/4326721.html
http://www.cnblogs.com/ym123/p/4331300.html

Guess you like

Origin http://43.154.161.224:23101/article/api/json?id=325881372&siteId=291194637