What is the difference between git pull and git fetch?

git fetch downloads the changes without merging them. git pull does a fetch + merge automatically. Use fetch when you want to inspect before merging, pull when you trust the remote changes.

Why does git pull create merge commits?

By default, git pull merges with a merge commit. If local and remote changes have diverged, Git creates a merge commit. Use --rebase for a linear history without merge commits.

How do I handle a conflict during a git pull?

Open the files marked as conflicted, choose which changes to keep, remove the markers ( >>>), run git add then git commit. Or use git merge --abort to cancel.

Do I need to commit before a git pull?

Yes, or use git stash. If you have uncommitted changes, git pull may refuse to merge to avoid overwriting your work.

What is the difference between pull --rebase and a normal pull?

A normal pull creates a merge commit. Pull --rebase replays your local commits on top of the remote changes, creating a cleaner linear history.

Git pull: retrieve remote changes

Your team pushed code? git pull downloads and merges remote changes into your local branch. It is the daily command for team collaboration.

Practice git pull Git Glossary

gitquest — enquête

Essential

What is git pull?

git pull is the combination of two commands: git fetch (download) and git merge (merge). In a single command, you retrieve and integrate your team's work.

Think of a mailbox: git fetch is checking if there's mail. git pull is checking and reading the mail right away.

Git pull syntax

git pull

Pull from the tracked branch

git pull origin main

Explicit pull from origin/main

git pull --rebase origin main

Pull with rebase for a linear history

Git pull in practice

Standard pull and pull with rebase.

Standard pull

gitquest — pull

# Retrieve your team's changes

$git pull origin main

remote: Enumerating objects: 5, done.

remote: Counting objects: 100% (5/5), done.

Fast-forward

index.html | 3 ++-

style.css | 1 +

2 files changed, 3 insertions(+), 1 deletion(-)

Pull with rebase

gitquest — pull --rebase

# Pull with rebase (linear history)

$git pull --rebase origin main

remote: Enumerating objects: 3, done.

Rebasing (1/1)

Successfully rebased and updated refs/heads/main.

# Configure pull rebase by default

$git config pull.rebase true

Configuration updated

git pull vs git fetch

`git pull`

Downloads remote changes and merges them into your local branch automatically.

Use when: you trust the remote changes

`git fetch`

Downloads remote changes without merging them. You can inspect before deciding.

Use when: you want to inspect before merging

Common mistakes with git pull

Pulling on the wrong branch

Check your current branch with git branch before pulling. Pulling on main while you are on your feature branch can create unexpected conflicts.

Unresolved conflicts

If a pull generates conflicts, Git waits for you to resolve them. Open the conflicted files, run git add then git commit. Or cancel with git merge --abort.

Uncommitted local changes

Git refuses to pull if you have uncommitted changes. Run git commit or git stash before pulling.

Part of the Git Remote & Collaboration guide

Related commands

git fetch

Download without merging

git push

Send your changes

git merge

Merge branches

GitQuest is created by Anaïs (nouvelle fenêtre), web developer and head of education, specializing in tech training and digital accessibility.

Questions about git pull

Master teamwork with GitQuest

GitQuest investigations simulate collaborative work: pull, push, conflicts, and resolutions.

Start the investigations