Skip to content

Three-Way Merge

In this lesson you will learn three-way merge in Git, why it matters within merging, and how to use it correctly with clear, copy-ready examples.

Three-Way Merge Overview

Three-Way Merge is something you will reach for often in Git. It keeps your workflow predictable and makes your intent obvious to reviewers and teammates.

When you learn three-way merge properly, you avoid the guesswork that leads to mistakes and rework. The example below shows the shape you will use in most real Git projects.

git switch main
git merge feature/login

# if there is a conflict, edit the marked files, then:
git add conflicted-file.js
git commit          # completes the merge

Merging combines branch histories; conflicts are resolved by editing files and staging them.

Three-Way Merge Example

git add <files>
git commit -m "message"
git push origin <branch>
  • Start from a minimal Three-Way Merge example and grow it only as needed.
  • Keep things explicit so Three-Way Merge behaves the same for everyone on the team.
  • Name things clearly so teammates understand your Three-Way Merge at a glance.
  • Verify Three-Way Merge works as expected before relying on it in important work.

Git Cheatsheet

Handy Git command reference related to three-way merge.

Task Command Purpose
Status git status See what changed
Stage git add <file> Prepare changes to commit
Commit git commit -m "msg" Record a snapshot
Branch git switch -c name Create and switch branch
Merge git merge branch Combine histories
Push git push origin main Share commits
Pull git pull origin main Get others' commits
Undo git restore <file> Discard local changes

How Three-Way Merge Works in Git

Three-Way Merge builds on Git's model of snapshots and references. Every commit points to a full snapshot of your project, and branches are simply lightweight pointers to commits.

Merging combines branch histories; conflicts are resolved by editing files and staging them.

  • The working directory, staging area, and repository are Git's three main areas.
  • Commits are immutable snapshots linked to their parents.
  • Branches and tags are just pointers to commits.
  • Remotes are copies of the repository you sync with.

Practical Guidance for Three-Way Merge

On real teams, three-way merge works best with small, focused commits and clear messages. Commit often, write descriptive messages, and pull before you push to avoid surprises.

Habit Why it helps
Small commits Easier to review and revert
Clear messages History explains the why
Branch per feature Isolates work in progress
Pull before push Avoids avoidable conflicts

Common Mistakes

  • Copying three-way merge commands or snippets without understanding what each part does.
  • Skipping edge cases and error handling when using three-way merge.
  • Not verifying the result of three-way merge before moving on.
  • Over-complicating three-way merge before you actually need the extra flexibility.

Key Takeaways

  • Three-Way Merge is a core part of working effectively with Git.
  • Start small and keep three-way merge focused on a single goal.
  • Apply consistent patterns so three-way merge scales across your project.
  • Practise and document three-way merge to keep your workflow maintainable.

Pro Tip

Practise three-way merge on a throwaway project first. It is far cheaper to learn Git mistakes there than on important work.

You now understand three-way merge in Git and how to apply it in real projects. Next, continue with No Fast-Forward Merge to keep building your skills.