Merge Conflicts

Understand and resolve conflicts visually

Conflicts happen when two branches change the same lines. Git needs you to decide which changes to keep.

Both branches edited the same lines. Git can't auto-merge.

main

<h1>Welcome Home</h1>

feat

<h1>Hello World</h1>

Conflict: same line, different changes

Terminal

$ git merge feature
Auto-merging index.html
CONFLICT (content): Merge conflict in index.html
Automatic merge failed; fix conflicts and then commit.

9 / 20