Create and merge SVN branches --- updating

========================================================== =============================== Original blog, reprinted please declare the source of Electronic coffee (original id blue rock) ========================================================== ================================

Create Branch

Svn cp svn: // 10.27.0.9/trunk/XX/SVN: // 10.27.0.9/branches/IOS/XX-M "Modify XXX"

Checkout to local:

SVN checkout SVN: // 10.27.0.9/branches/IOS/xx -- username = zhangsan ../xx

# View the branch version after it is created

SVN log -- stop-on-copy

# Merge main into branch

SVN merge SVN: // 10.27.0.9/trunk/xx

# Merge to main

CD to main directory

SVN merge-r1150: 1941 SVN: /zhangsan@10.27.1.2/branches/IOS/demo_offline

# Tree conflict occurs in merge. solution:

SVN resolve -- accept working-R.