- Go to: View > Other Windows > Pending Changes
- Find an applicable line item here and pick "Edit Conflicts" after right-clicking upon it.
- Check checkboxes.
- Click "Accept Merge" at the upper right.
- Once more find your line item, right-click upon it and pick: Resolve > Resolve Conflict
Sunday, October 16, 2016
The Ankh way of cleaning up conflicts in Visual Studio is a lot cleaner than figuring out the mine/theirs stuff which it kinda hides from you.
Subscribe to:
Post Comments (Atom)
No comments:
Post a Comment