Question: How does automatic conflict resolution work?

- J.D. Meier, Jason Taylor, Alex Mackman, Prashant Bansode


A conflict can occur as a result of a pending change, merge, or get operation. When you opt to resolve the conflict, you can choose to have Visual Studio resolve the conflict automatically. Automatic conflict resolution only works on non-binary files that have no overlapping changes (for example, changes applied to the same line of code). In this case, changes for both file versions are merged into a new file version.

If automatic conflict resolution does not work, you can choose to only accept changes from one of the files, or you can perform a manual merge by using the graphical compare and differencing tools provided by VSTS.

Additional Resources

Last edited Jul 18, 2007 at 10:24 PM by jtaylorsi, version 8


No comments yet.