TFS:使用主分支的更改更新分支
所以,我们有我们的主开发线,我创建一个分支,开发人员 b 创建一个分支。我们俩都做一些工作。开发人员 b 完成他的工作,合并回主开发线。我知道他的更改会影响我,我不想稍后再处理冲突,而是想使用现在主开发行中的更改来更新我的分支,这样我就可以在合并之前在我的分支中处理它们回到主程序。
我该怎么做?
So, we have our main dev line, I create a branch, and developer b creates a branch. We both do some work. developer b finishes his work, merges back into the main dev line. I know his changes will affect me, and rather than deal with the conflicts later, I would like to update my branch, with the changes that are now in the main dev line, so I can deal with them in my branch, prior to merging back into main.
How do I do that?
如果你对这篇内容有疑问,欢迎到本站社区发帖提问 参与讨论,获取更多帮助,或者扫码二维码加入 Web 技术交流群。

绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
发布评论
评论(1)
从 Visual Studio 中,打开源代码管理资源管理器:
我建议将合并(以及任何必要的合并冲突解决、构建中断、测试中断)保留为自己的变更集。也就是说,不要将其他功能与合并混合在一起。粒度变更集使查看源代码控制历史记录和识别单个感兴趣的变更变得更加容易。将合并工作保留在自己的变更集中有助于实现该目标。
还有用于合并的命令行,从 Visual Studio 命令提示符运行
tf merge /?
。From Visual Studio, open Source Control Explorer:
I recommend keeping merges (and any necessary merge conflict resolution, build breaks, test breaks) as their own changeset. That is, do not mix other feature work with merges. Granular changesets make it much easier to review source control history, and to identify a single change of interest. Keeping merge work in its own changeset helps work toward that goal.
There is command-line for merging as well, run
tf merge /?
from a Visual Studio Command Prompt.