一、Team 合并
二、Merge Input
| |
Merge a range of revisions | 从主干合并到分支 |
Reintegrate a branch | 从分支合并到主干 |
Change-set based merge | 将主干上的修改合并到分支，需要Collabnet软件 |
Merge two different trees | 合并2个分支到主干 |
Manually record merge information | 从主干到分支，手工指定不需要合并的修改 |
Manually remove merge information | 从主干到分支，手工指定要合并的修改 |
** Best Practices可能出现异常信息
（1）Working copy at a single revision
点击update更新
Working copy should not have any local modifications
Commit or revert any local changes before merging
有两种选项
1. 分支修改的内容需要先提交，选择Commit
2. 忽略本地修改，获取服务器最新版本，选择revert
三、选择范围
All eligible revisions
select revisions on next page
四、冲突处理
Prompt me for each conflict and left me decide
Mark conflcts, let me resolve them later
重用第二条选项，如果有冲突自己处理
五、结果信息
Merge Results
