TFS SourceControl 从主干分支合并
我在 Visual Studio TFS 中进行分支时遇到问题。 这可能是由于我正在开发的方法所致，但如果是这种情况，请让我知道分支的最佳实践是什么，我将更改我们的程序。
大约一个月前，我对一个项目进行了分支，以便可以开始开发 Web 应用程序的新版本，但在我测试并尝试将内容转移到生产水平状况。
因此，就在几天前，我们意识到在生产中运行的应用程序的当前版本存在一些错误。 我修复了主分支上的这些错误，重新部署了 Web 应用程序，并将错误修复签入主应用程序主干。 这就是问题所在。 现在主干已经修复了错误，但我的新版本分支没有。
这是我的问题：我如何进行版本比较或类似的操作以将错误修复到分支项目中？
我可能会做一些不寻常的事情。 这是由于我缺乏对分支和开发生命周期的了解。 请告诉我是否有更好的方法可供你们在开发商店中实践。
干杯，
C
I'm having trouble with branching in Visual Studio TFS. This may be due to the method in which I am developing, but if this is the case, please let me know what the best practice is with branching and I will change our procedure.
About a month ago, I branched a project so that I could begin developing a new version of the web application, but didn't want the main trunk of the application to be affected by my changes as I tested and tried to get things to a production level status.
So as of a couple days ago, we became aware of a few bugs with the current version of the application that is running in production. I fixed these bugs on the main branch, redeployed the web application, and checked in the bug fixes to the main application trunk. And here is where the problem lies. Now the main trunk has the bug fixes, but my new version branch does not.
Here is my question: How do I go about doing a version compare or something of the sort to get the bug fixes into the branched project?
I may be doing things un-ordinarilly. This is due to my lack of knowledge of branching and development life cycles. Please let me know if there is a better method that you all practice in your development shops.
Cheers,
C
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（2）
听起来你正在做对我来说正确的事情，你只需要将更改合并到你的开发分支中。
要合并更改，您需要位于源代码管理资源管理器中。 右键单击“源”分支（在您的情况下是主分支），然后选择“合并”。 然后，您将进入合并向导，您可以在其中选择要合并到的分支（您的开发分支）。 就我个人而言，我总是选择该页面上的“选定的变更集”选项，因为它会为您提供变更集列表，您可以选择要带入开发分支的变更集范围的开始和结束。
希望有帮助。
马丁.
Sounds like you are doing the correct thing to me, you just need to merge your changes into your dev branch.
To merge the changes, you need to be in Source Control Explorer. Right click on the "source" branch (in your case that is the main branch) and then select "Merge". You will then go into the merge wizard where you can pick which branch you would like to merge into (your development branch). Personally, I always pick the "selected changesets" option on that page as it then gives you a list of changesets and you can pick the start and end of the range of changesets that you want to bring into your development branch.
Hope that helps.
Martin.
您只需将这些更改合并到新版本分支即可。
分支和合并指南是一个很好的起点。 阅读它以了解如何组织您的分支机构。
You just need to merge those changes to the new-version-branch.
A good starting point is the branching and merging guidance. Read it to find out how you can organize your branches.