Resolving Conflicts During Git Merge
How to recognise and subsequently resolve conflicts when performing a merge using Git
Git Merge Dialog
Working with the Git Merge dialog to resolve conflicts
Resolving Merges
Using the diff view to resolve merge conflicts
Summary
Summary