
Troubleshooting
Git Merge Conflict: How to See the Diff Between Versions
When you run git merge and hit a conflict, Git pauses and marks the conflicting file...