SVN分支合并到主版本
Opened this issue · 0 comments
benbenzlj commented
SVN 分支合并到主版本步骤
- 主版本上右键，SVN => 合并
- 选择合并一个版本范围
- 选择分支路径，并且选择合并所有版本
- 选择忽略所有空白字符
- 合并过程中如果有冲突分弹出对话框，对话框内容如下，根据实际情况处理
[Postpone]
skip this conflict and leave it unresolved
跳过此冲突, 并使其未解决
[Accept base]
discard local and incoming changes for this files
放弃此文件的本地和传入更改
[Accept incoming]
accept incoming version of entire file
接受整个文件的传入版本
[Reject incoming]
reject all incoming changes for this file
拒绝此文件的所有传入更改
[Accept incoming for conflicts]
accept incoming changes only where they conflict
仅在传入更改发生冲突时接受这些更改
[Reject conflicts]
reject incoming changes which conflict and accept the rest
拒绝冲突的传入更改, 并接受其余更改
[Mark as resolved]
accept the file as it appears in the working copy
接受文件在工作副本中显示的内容