Understand and Resolve Merge Conflicts

This topic describes what you need to know to understand and resolve the merge conflicts that Git can't automatically resolve.

Topics:

• What are Merge Conflicts?

• About the Merge Editor

• Understand How to Resolve Conflicts

• Change Git's Merge Strategy

• Cancel All Merge Conflicts

• Resolve All Merge Conflicts

• Resolve Individual Merge Conflicts