Handling merge conflicts

Conflicts occur when changes on the same part of a file exist in both branches. To resolve:

1. Git pauses merge, marking conflicted files
2. Manually edit conflicted files, choosing changes to keep
3. Mark as resolved: git add <conflicted-file>
4. Complete merge: git commit

Use git merge --abort to cancel a merge with conflicts.