📋 Load an Example
1. Paste Conflicting Code
📚 Git Conflict Cheat Sheet
Conflict markers
<<<<<<< HEAD current branch changes ======= incoming branch changes >>>>>>> feature-branch
Common commands
git status # see conflicted files git diff # view all conflicts git checkout --ours FILE # accept HEAD git checkout --theirs FILE # accept incoming git add FILE && git commit # mark resolved git merge --abort # cancel the merge
Tips: After resolving, run
git diff --check to ensure no conflict markers remain before committing.
Use git log --merge to see commits from both branches involved in the conflict.
Related Resources
Related Tools