Skip to content

Git Merge

Merge is an important part of working effectively with Git. This lesson explains what merge means, how it works, and how to apply it with practical examples you can reuse.

Merge Overview

Merge lets you work with Git in a way that stays clear, repeatable, and easy to scale. Instead of ad-hoc steps, you follow a pattern that other developers recognise immediately.

The key is to keep merge focused and predictable. Start from the minimal example here, then add only the complexity your situation actually needs.

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.

Merge Example

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

Git Cheatsheet

Handy Git command reference related to 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 Merge Works in Git

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 Merge

On real teams, 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 merge commands or snippets without understanding what each part does.
  • Skipping edge cases and error handling when using merge.
  • Not verifying the result of merge before moving on.
  • Over-complicating merge before you actually need the extra flexibility.

Key Takeaways

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

Pro Tip

When you get stuck on merge, reduce it to the smallest example first — most Git problems become obvious once the noise is gone.

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