Navigate conflicts only (TFS)
It's a function we have in Visual Studio 2010 when a conflict between 2 files is detected and we have to manually merge them. When this function is activated the "next conflict" button goes only on the conflicts that have to be merged manually. The others can be merged automatically.
1
vote
