Git Merge Tools That Work Well with GitHub

Merge conflicts are part of working in Git. No team avoids them forever. What does vary is how...