Git & GitHub
/Beginner
git pull
Definition
Fetches changes from a remote repository and immediately merges them into the current branch.
Explain Like I'm New
A shortcut command. `git pull` is literally just `git fetch` followed immediately by `git merge`. It downloads the new code from GitHub and instantly overwrites the files in your VS Code to match.
Real World Example
Every morning when you start work, you run `git pull` on the `main` branch to make sure you have the latest code from your teammates before you start writing new code.
Common Use Cases
- •Syncing local codebase with the cloud quickly
Crucial Command Flags
| Flag / Option | Description |
|---|---|
| --rebase | Fetch and then rebase local commits on top of the fetched branch instead of merging. |
| --ff-only | Only update if it can be fast-forwarded (aborts if a merge commit is required). |
Terminal Output
bash / terminal
# 1. You are on your 'main' branch locally.
# 2. You pull the latest changes from the GitHub server.
$ git pull origin main
# Under the hood, Git did this:
# $ git fetch origin main
# $ git merge origin/main
# If there are no conflicts, your local files instantly update!
Interview Questions
basic
- Can `git pull` cause a merge conflict?
intermediate
- If `git pull` is a shortcut, what two commands is it combining?