除了TFVC之外，可以使用哪个源代码控制从TFS获取代码? [英] Which source control can be used to get code from TFS apart from TFVC?

问题描述

我合并了2个分支，没有冲突.我看到没有冲突，因此立即取消了自动解决冲突的检查.

I merged 2 branches and there are no conflicts. I saw that there are no conflicts and immediately unchecked the auto resolution of conflicts.

我再次合并了分支，但仍然没有冲突.

I merged the branches again and still there are no conflicts.

打开待处理的更改后，我看到了.我认为通常应该有一个用于冲突的按钮或链接.但是没有这种东西.

After I opened the pending changes, I saw this. I think there should generally be a button or link for conflicts. But there is no such thing.

我有很多冲突的代码.每当我认为应该有冲突时，它只是保留我的版本.

I have a lot of conflicting code. It is just keeping my version whenever I think there should be a conflict.

有人可以根据我的经验告诉我，即使有冲突的代码，为什么也没有显示出冲突能够解决.我可以使用其他源代码控件(如GIT)执行合并吗?有可能吗?

Can somebody tell me in their experience why conflicts are not shown to resolve even when there is conflicting code. Can I use another source control like GIT to perform the merge ? Is it possible?

推荐答案

所有更改都已合并到本地工作区中.正如您在待处理更改列表中看到的那样，所有更改都用[merge, ...]标记.

All of your changes have already been merged in your local workspace. As you can see in the pending changes list all changes there are marked with [merge, ...].

如果要再次执行合并，而没有任何自动合并，则必须首先撤消待处理的更改.然后确保关闭自动合并，然后再次执行合并操作.

If you want to perform the merge again, without any automatic merging you will have to first undo the pending changes. Then ensure that auto-merge is turned off, then perform the merge action again.

鉴于自动合并成功，我希望您仍然不会发现任何冲突.看起来TFVC能够基于自动合并成功的事实自行找出所有合并.

Given that the automatic merge succeeded, I'd expect that you still won't find any conflicts. It looks like TFVC is able to figure out all of your merges on its own based on the fact that the auto merge succeeded.

还有另一种可能性...如果过去您已与该分支合并并选择了保留我的"，那么TFVC将注册此选择，并将在以后的合并中牢记这一点.如果您不知道正在发生的情况，这可能会在以后导致意外的行为.撤消这些所谓的合并票证"的唯一方法是对这些先前的合并执行回滚.在不撤消这些合并工单的情况下，您还有一个选项可以仅对内容进行强制合并，您需要从命令行执行合并并提供force开关:

There is another possibility... If in the past you have merged with this branch and have chosen "Keep mine" then TFVC registers this choice and will keep this in mind in future merges. This can cause unexpected behaviour later if you weren't aware this was happening. The only way to undo these so-called "merge tickets" is to perform a Rollback on those previous merges. Without undoing these merge tickets you have one more option to force a merge on contents only, you'll need to perform the merge from the commandline and supply the force switch:

tf vc merge /recursive /force /noautoresolve $/Project/BranchA $/Project/BranchB

这篇关于除了TFVC之外，可以使用哪个源代码控制从TFS获取代码?的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！