如何解决 TFS 中的冲突？
如何解决 TFS 中的冲突？
我一定是忘记在编辑文件之前进行递归获取。无论原因是什么，我现在必须找出解决冲突的方法。
当我单击工作区执行签入时。其中一个文件是双向箭头，我想这一定意味着存在冲突。
当我单击执行“签入”时，会出现一个消息框，告诉我： “由于更改冲突，没有签入文件。请使用冲突频道解决冲突，然后重试”。
所以我用谷歌搜索“Conflicts Channel TFS”，得到了一些结果，但所有结果都只给出了建议，例如，单击“自动解决”。问题是我没有看到他们建议的任何菜单命令或按钮。
How do I resolve conflicts in TFS?
I must have forgotten to do a recursive get before editing a file. Whatever the cause is, I must now figure out how to resolve a conflict.
When I click on the workspace to performa check-in. One of the files as a two-way pointing arrow which I guess must mean there is a conflect.
When I click to perform a "Check In" a message box appears that tells me:
"No files checked in due to conflicting changes. Please use Conflicts Channel to resolve conflicts and try again".
So I googled "Conflicts Channel TFS" and I got some results but all of the results only gave suggestions, like, Click on "Automatic Resolve". The problem is that I do not see any of the menu commands or buttons to ckick on that they suggest.
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（2）
尝试获取该文件的最新信息。这应该会触发冲突解决屏幕。
Try getting latest on the file. That should trigger the conflict resolution screen.
从主工具栏打开 Visual Studio 中的“视图”菜单。向下滚动到“其他窗口”，然后打开“待处理更改”窗口。
在此 Pending Changes 窗口的右侧，有 5 个按钮，每个按钮都有一个图标。向下第五个是“冲突”按钮。这将向您显示所有冲突，并允许您在这里解决它们。
Open the View menu in Visual Studio from the main tool bar. Scroll down to 'Other Windows', then open the 'Pending Changes' window.
On the right side of this Pending Changes window, there are 5 Buttons, each with an icon. The 5th one down is the Conflicts button. This will show you all the conflicts and will allow you to resolve them here.