Resolving Conflicts During Git Merge
How to recognise and subsequently resolve conflicts when performing a merge using Git.
![Git Merge Dialog](/guide/assets/thumbnail-415f267f.png)
Git Merge Dialog
Working with the Git Merge dialog to resolve conflicts.
![Resolving Merges](/guide/assets/thumbnail-ca078f40.png)
Resolving Merges
Using the diff view to resolve merge conflicts.
![Summary](/guide/assets/thumbnail-0e1ecd3d.png)
Summary
Summary and shortcuts.