Settings and activity
'Use Visual Studio or VS Code as a merge tool.' has been merged into this idea
1 result found
-
131 votes
Geoff Pate
supported this idea
·
An error occurred while saving the comment
I think we'd like to see a three way merge tool like p4merge or beyondcompare rather than accept mine\theirs. Particularly in scenarios where there are lots of merges (merging from the trunk to work branches for example)