如何让 VisualStudio 在 TFSGet 之后打开“解决冲突”窗口

当我在 VisualStudio 中执行 GetLatest 时，如果存在冲突，则没有显示任何东西使其显而易见。我总是认为一切都很好，做一个构建，通常构建工作。

我总是有责任记住去寻找冲突，去打开冲突窗口。 有没有什么办法能让 VS 直面我，告诉我现在有冲突了？

68262 次浏览
小开

If you're coding in C# then on your Visual Studios editor, select the Tools menu, then the options submenu.

A dialog will pop up. From there select Text Editor, then select C#, then select Advanced.

Then check the box for Show live semantic errors.

小开

You can re open the Resolve Conflicts window if you closed it by mistake from Team Explorer. Goto: Pending Changes, then from the Actions drop down, select Resolve Conflicts.

From there you can click Get All Conflicts.

Normally VS will prompt you to resolve any conflicts as soon as you do one of the following:

  • Get latest
  • Check in
  • Merge
小开

Click the link I surrounded with a red contour in the Team Explorer pane.

enter image description here

And in Visual Studio 2013:

enter image description here


提交答案