git pull to download and merge - Cheat Sheet & Quick Revision

Recall & Review

beginner

What does the git pull command do?

git pull downloads changes from a remote repository and merges them into your current branch.

beginner

What two git commands does git pull combine?

git pull combines git fetch (to download changes) and git merge (to merge changes into your branch).

intermediate

What happens if there are conflicts during a git pull merge?

Git will pause the merge and ask you to fix conflicts manually before completing the merge.

beginner

How do you specify which remote branch to pull from?

Use git pull <remote> <branch>, for example git pull origin main.

beginner

What is the difference between git pull and git fetch?

git fetch only downloads changes but does not merge them. git pull downloads and merges in one step.

What does git pull do?

A Downloads and merges changes from a remote branch

B Deletes local changes

C Creates a new branch

D Pushes local changes to remote

git pull downloads changes from a remote and merges them into your current branch.

Which two commands are combined by git pull?

A git clone and git commit

B git fetch and git merge

C git push and git merge

D git status and git add

git pull runs git fetch then git merge.

If a merge conflict happens during git pull, what should you do?

A Ignore it and continue

B Delete your local branch

C Fix conflicts manually and complete the merge

D Run <code>git push</code>

You must fix conflicts manually before finishing the merge.

How do you pull changes from the remote branch named develop?

A git fetch develop

B git push origin develop

C git merge develop

D git pull origin develop

Use git pull origin develop to pull from the develop branch on remote origin.

What is the main difference between git fetch and git pull?

A <code>git pull</code> downloads and merges, <code>git fetch</code> only downloads

B <code>git fetch</code> merges changes, <code>git pull</code> does not

C <code>git fetch</code> deletes branches, <code>git pull</code> creates branches

D They do the same thing

git pull downloads and merges changes; git fetch only downloads.

Explain what happens step-by-step when you run git pull.

Think about fetching and merging.

Describe how you would handle a merge conflict after running git pull.

Focus on conflict resolution steps.

Practice

1. What does the git pull command do in a Git repository?

easy

A. Deletes the remote branch from the repository

B. Downloads changes from a remote branch and merges them into the current branch

C. Creates a new branch locally

D. Uploads local changes to the remote repository

Solution

1. Step 1: Understand the purpose of git pull

   The git pull command fetches changes from a remote branch to your local repository.

2. Step 2: Recognize the merge action

   After downloading, it automatically merges those changes into your current local branch.

3. Final Answer:

   Downloads changes from a remote branch and merges them into the current branch -> Option B

4. Quick Check:

   git pull = download + merge [OK]

Hint: git pull = fetch + merge in one step [OK]

Common Mistakes:

• Thinking git pull only downloads without merging
• Confusing git pull with git push
• Assuming git pull creates new branches

2. Which of the following is the correct syntax to pull changes from the remote branch named main?

easy

A. git pull origin main

B. git pull main origin

C. git push origin main

D. git fetch origin main

Solution

1. Step 1: Identify the correct order of arguments

   The syntax for pulling from a remote branch is git pull <remote> <branch>. Here, origin is the remote and main is the branch.

2. Step 2: Confirm the command meaning

   git pull origin main downloads and merges changes from the main branch on the origin remote.

3. Final Answer:

   git pull origin main -> Option A

4. Quick Check:

   git pull remote branch = git pull origin main [OK]

Hint: Remember: git pull remote branch [OK]

Common Mistakes:

• Swapping remote and branch names
• Using git push instead of git pull
• Using git fetch which only downloads

3. Given the following commands run in a Git repository:

git checkout feature
git pull origin main

What happens after these commands?

medium

A. Local changes are pushed to the main branch

B. The main branch is checked out and updated

C. A new branch named origin is created

D. The feature branch is updated with changes from the main branch

Solution

1. Step 1: Analyze the branch checkout

   The command git checkout feature switches the current branch to feature.

2. Step 2: Understand the pull command

   git pull origin main downloads changes from the main branch on the remote origin and merges them into the current branch, which is feature.

3. Final Answer:

   The feature branch is updated with changes from the main branch -> Option D

4. Quick Check:

   git pull merges remote branch into current branch [OK]

Hint: git pull merges remote branch into current branch [OK]

Common Mistakes:

• Assuming git pull switches branches
• Thinking git pull pushes changes
• Confusing which branch is updated

4. You run git pull origin main but get a merge conflict error. What is the best way to fix this?

medium

A. Manually resolve conflicts in files, then commit the merge

B. Run git pull --force to overwrite local changes

C. Delete the local branch and recreate it

D. Run git push origin main to fix conflicts

Solution

1. Step 1: Understand merge conflicts

   A merge conflict means Git cannot automatically combine changes because of overlapping edits.

2. Step 2: Resolve conflicts manually

   You must open the conflicting files, fix the differences, then save and commit the merge to complete the pull.

3. Final Answer:

   Manually resolve conflicts in files, then commit the merge -> Option A

4. Quick Check:

   Fix conflicts manually, then commit [OK]

Hint: Resolve conflicts manually, then commit merge [OK]

Common Mistakes:

• Using --force which can lose local work
• Deleting branches unnecessarily
• Trying to push before resolving conflicts

5. You want to update your local develop branch with changes from the remote main branch. Which command sequence achieves this safely?

hard

A. git fetch origin main && git merge origin/main develop

B. git checkout develop && git pull main origin

C. git fetch origin main && git checkout develop && git merge origin/main

D. git merge origin/main develop && git fetch origin main

Solution

1. Step 1: Fetch remote changes without switching branches

   git fetch origin main downloads the latest main branch changes but does not merge them.

2. Step 2: Switch to develop and merge fetched changes

   After fetching, git checkout develop switches to the develop branch, then git merge origin/main merges the remote main into develop.

3. Final Answer:

   git fetch origin main && git checkout develop && git merge origin/main -> Option C

4. Quick Check:

   Fetch first, then checkout and merge [OK]

Hint: Fetch first, then checkout and merge to update safely [OK]

Common Mistakes:

• Trying to merge without fetching first
• Merging into wrong branch
• Assuming git pull works without switching branches