DEV Community

Discussion on: What is your favourite git merge tool/strategy?

Collapse
 
psfeng profile image
Pin-Sho Feng

My favorite tools are TortoiseGit + Beyond Compare, but TortoiseGit only works on Windows. On Mac I use SourceTree with Beyond Compare as well.