asked on
Visual Studio 2019 standard diff tool - looking for toolbar with buttons such as "next" difference etc.
I WinMerge to compare my own folders. You can edit both files which is sometimes useful. I sometimes use it to compare my folder with a coworker's folder.
Kdiff3 is a free comparison editor which is easier to use especially with git merge. (One developer could not remove merge conflicts using WinMerge, but we worked together with kdiff3 and removed them.)
It helps protect you from a git merge command that can result in good code being overwritten by a developer. It not only shows merge conflicts, but also shows the choices the git merge command made. It is easy enough to choose which source to go with or even use pieces of both files. Here's a discussion of kdiff3.
https://stackoverflow.com/questions/572237/whats-the-best-three-way-merge-tool/1593110#1593110
ASKER
Thanks, serialband, I really want to use Beyond Compare.
I found this screendump that shows a useful Diff toolbar.