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.