How to Resolve Merge Conflict in Git Quickly and Easily

A merge conflict happens when Git cannot automatically combine changes from different branches. To resolve it, open the conflicting files, edit the conflict markers to keep the correct code, then use git add and git commit to finish the merge.

Why This Happens

A merge conflict occurs when two branches have changed the same part of a file differently, and Git cannot decide which change to keep. This usually happens when multiple people edit the same lines or when you try to merge branches with overlapping edits.

diff

<<<<<<< HEAD
console.log('Hello from branch A');
=======
console.log('Hello from branch B');
>>>>>>> feature-branch

Output

Auto-merging example.js
CONFLICT (content): Merge conflict in example.js
Automatic merge failed; fix conflicts and then commit the result.

The Fix

Open the file with conflict markers (<<<<<<<, =======, >>>>>>>). Decide which code to keep or combine both. Remove the markers, save the file, then run git add <file> and git commit to complete the merge.

javascript

console.log('Hello from branch A and branch B');

Output

Merge made by the 'recursive' strategy.
 example.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Prevention

To avoid merge conflicts, communicate with your team to avoid editing the same lines simultaneously. Pull changes often with git pull before starting work. Use small, focused commits and branches. Tools like code reviews and feature toggles also help reduce conflicts.

Related Errors

Other common Git errors include:

• Rebase conflicts: Similar to merge conflicts but happen during git rebase.
• Unmerged paths: Occur when conflicts are not resolved before committing.
• Detached HEAD: Happens when you checkout a commit directly, not a branch.

Fixes usually involve resolving conflicts manually or resetting to a safe state.

Key Takeaways

Merge conflicts happen when Git can't auto-merge changes in the same file lines.

Edit conflicting files to choose or combine changes, then add and commit to finish.

Pull changes often and communicate to reduce conflicts.

Use small branches and commits to keep merges simple.

Understand related errors like rebase conflicts to handle Git smoothly.