Merge conflicts occur when two branches modify the same lines. Resolve manually: choose ours/theirs or combine both.

• Merge conflicts occur when two branches modify the same lines

• Conflict markers: <<<<<<< ours, ======= theirs, >>>>>>>
• Resolve: edit to keep correct code, remove markers, commit resolution
• Prevention: small PRs, frequent merges, communication with team

Merge conflicts occur when two branches modify the same lines. Resolve manually: choose ours/theirs or combine both.

• Merge conflicts occur when two branches modify the same lines

• Conflict markers: <<<<<<< ours, ======= theirs, >>>>>>>
• Resolve: edit to keep correct code, remove markers, commit resolution
• Prevention: small PRs, frequent merges, communication with team