📁 Files

greeting.txt

! ConflictS StagedM ModifiedU Untracked

No files staged. Use git add to stage changes.

📊 Commit Graphcurrent branchfeature

⚔️ Conflict ResolutionIntermediate0/3

📖 Concepts

Merge ConflictOccurs when two branches modify the same part of the same file. Git pauses the merge and asks you to decide which changes to keep.

Conflict MarkersGit marks conflicts with <<<<<<< HEAD (your changes), ======= (separator), and >>>>>>> branch (their changes). You edit the file to resolve, then remove the markers.

ResolvingEdit the conflicted file to keep what you want, run git add <file> to mark it resolved, then git commit to complete the merge.

View the diverged branches

Run git log --all --oneline. Both main and feature modified greeting.txt after the initial commit — they have diverged.

● View the diverged branches

○ Merge main into feature to trigger a conflict

○ Resolve the conflict and commit

Terminal

📘 Starting tutorial: Conflict Resolution

Learn to resolve merge conflicts step by step

Step 1: View the diverged branches