3月 102015
- 从分支合并回主干
12cd /path/to/trunksvn merge --reintegrate ^/branch_xxx
- 从主干到分支合并代码
12cd /path/to/branchsvn merge ^/trunk
|
1 2 |
cd /path/to/trunk svn merge --reintegrate ^/branch_xxx |
|
1 2 |
cd /path/to/branch svn merge ^/trunk |