如何将本地分支合并到TFS中
[英]How do I merge a local branch into TFS
问题描述
I did a stupid thing and branched my project on my local disk instead of doing it on the TFS. 
我做了一个愚蠢的事情，然后将项目分支到本地磁盘上，而不是在TFS上进行。 So now I have two projects on my disk: the old one which has TFS bindings and the new, which doesn't. 所以现在我的磁盘上有两个项目：旧的有TFS绑定的项目，新的没有TFS绑定的项目。 I want to merge those changes back into the TFS project. 我想将这些更改重新合并到TFS项目中。 How would I go about doing that? 我将如何去做？ I can't do Compare because my local branch has no TFS bindings. 我无法进行比较，因为我的本地分支没有TFS绑定。 There should be some way to compare the differences between the two projects locally and then meld the differences into the old project and check-in, but I can't find an easy way of doing that. 应该有某种方法可以比较本地两个项目之间的差异，然后将差异融合到旧项目中并签入，但是我找不到一种简便的方法。 Any other solutions? 还有其他解决方案吗？
1 个解决方案
解决方案1
0 已采纳 2010-05-11 21:23:17
How about using a 3rd party tool to compare and merge. 如何使用第三方工具进行比较和合并。 You can always do a get on the source (c:\\tfs\\solution) and compare it with the local project (c:\\myLocalSolution). 您始终可以获取源代码（c：\\ tfs \\ solution），并将其与本地项目（c：\\ myLocalSolution）进行比较。 Check out the entire tfs solution for edit before merging your local to the tfs. 在将本地合并到tfs之前，请先检查整个tfs解决方案以进行编辑。
声明:本站的技术帖子网页，遵循CC BY-SA 4.0协议，如果您需要转载，请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.