How to Resolve Merge Conflicts After git pull

Symptom

CONFLICT (content): Merge conflict in filename
Automatic merge failed; fix conflicts and then commit the result.

Resolution Steps

1. Check Which Files Have Conflicts

git status

2. Open the File and Edit

<<<<<<< HEAD
Your local changes
=======
Incoming changes
>>>>>>> branch-name

Remove the <<<<<<<, =======, and >>>>>>> markers and keep the correct content.

3. Commit

git add .
git commit -m "resolve conflict"

Abort the Merge

git merge --abort

Common Pitfalls

• Don’t commit with conflict markers still in the file — it will break the code
• Pull frequently to keep conflicts small and manageable

To avoid conflicts altogether, git rebase Basics lets you replay your commits on top of the latest remote branch.

Related Posts

• Git Branch Basics: Create and Switch Branches
• How to Undo a Git Commit
• How to Use git stash to Save Work in Progress
• How to View Commit History with git log

Recommended Services

• Fiverr - Find freelance developers and tech experts