合并tfs中的更改
我们有一个主要的开发分支，它是针对 1.0 版本的分支。我们还对主开发分支进行了分支来进行一些并行开发。在release 1.0分支中完成了热修复并合并到主分支。现在并行开发已经完成。一切都已签入。如果我们将主分支与并行分支进行比较，我们可以看到差异。我们想要从并行开发分支合并到主分支，但 TFS 报告没有任何要合并的内容。什么！？
We have a main development branch, which was branched for a release 1.0. We also have branched the main development branch to do some parallel development. A hot fix was done in the release 1.0 branch and merged up to the main branch. Now parallel development is complete. Everything has been checked in. If we compare the main branch to the parallel branch we can see the differences. We want to merge from the parallel dev branch down to main, but TFS is reporting nothing to merge. What!?
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
在进行反向积分（从并行回到主）之前，您需要先进行正向积分（从主到并行）。
You'll want to do forward integration (from main to parallel) before you do your reverse integration (from parallel back to main).