📁 Files

README.md

config.py

! ConflictS StagedM ModifiedU Untracked

No files staged. Use git add to stage changes.

📊 Commit Graphcurrent branchfeature/settings

⚡ Merge ConflictAdvanced0/5

📖 Concepts

Merge conflictA merge conflict happens when two branches modify the same part of the same file. Git doesn't know which version to keep, so it pauses the merge and asks you to decide.

Conflict markersGit writes markers into the conflicted file: <<<<<<< HEAD (your changes), ======= (separator), >>>>>>> branch-name (their changes). Edit the file to keep what you want, then remove the markers.

ResolvingAfter editing, run git add <file> to mark it as resolved. Once all conflicts are resolved, run git commit to complete the merge with both parents in the history.

📖 Story

You and a teammate both modified config.py on separate branches. Your teammate merged their changes to main, and now you need to integrate them into your feature branch. When you run git merge main, Git can't auto-merge because both sides changed the same lines. The merge pauses with a conflict. You need to edit the conflicted file, choose what to keep, stage it as resolved, and complete the merge commit.

View the diverged branches

Run git log --all --oneline. Two branches exist: main and feature/settings. Both modified config.py differently after the initial commit — that's a merge conflict waiting to happen.

● View the diverged branches

○ Merge main into feature/settings

○ View the conflicted file

○ Resolve the conflict and stage it

○ Complete the merge

Terminal

📘 Starting tutorial: Merge Conflict

Resolve a merge conflict: branch off, both sides edit the same file, merge, and fix

Step 1: View the diverged branches