git pull to download and merge - Practice Problems & Coding Challenges

Challenge - 5 Problems

💻 Command Output

intermediate

What is the output of a successful git pull?

You run git pull on a branch that is behind the remote by 3 commits. What will you see in the terminal?

Git

git pull

A fatal: Not a git repository (or any of the parent directories): .git

B Updating abc1234..def5678\nFast-forward\n file1.txt | 2 ++\n file2.txt | 5 +++++\n 2 files changed, 7 insertions(+)

C error: Your local changes to the following files would be overwritten by merge:\n file1.txt\nPlease commit your changes or stash them before you merge.

D Already up to date.

💡 Hint

Think about what happens when your local branch is behind the remote and you pull.

When you run git pull and your branch is behind, Git fetches the new commits and merges them. The output shows the commit range updated and files changed.

🧠 Conceptual

intermediate

What does git pull do internally?

Choose the correct description of what git pull does internally.

A It runs <code>git fetch</code> to download changes, then <code>git merge</code> to combine them into the current branch.

B It only downloads changes from the remote without merging them.

C It deletes local changes and replaces them with remote files.

D It creates a new branch with the remote changes.

💡 Hint

Think about the two main steps involved in updating your local branch with remote changes.

git pull is a shortcut for git fetch followed by git merge. It downloads remote changes and merges them into your current branch.

❓ Troubleshoot

advanced

What error occurs if you have uncommitted changes that conflict with git pull?

You have local changes in a file that conflict with incoming changes from git pull. What error message will Git show?

Git

git pull

A error: could not lock config file .git/config: Permission denied

B fatal: refusing to merge unrelated histories

C Already up to date.

D error: Your local changes to the following files would be overwritten by merge:\n file.txt\nPlease commit your changes or stash them before you merge.

💡 Hint

Think about what Git does to protect your uncommitted work.

If your local changes conflict with incoming changes, Git prevents the merge to avoid overwriting your work. It asks you to commit or stash first.

🔀 Workflow

advanced

Which command sequence safely updates your branch with remote changes when you have local uncommitted work?

You want to update your branch with remote changes but have local uncommitted edits. Which sequence is correct?

A git stash\ngit pull\ngit stash pop

B git pull\ngit stash\ngit commit

C git commit\ngit pull\ngit reset --hard

D git fetch\ngit reset --hard origin/main

💡 Hint

Think about temporarily saving your changes before pulling.

Stashing saves your local changes temporarily. Then you pull remote changes safely. Finally, you reapply your changes with git stash pop.

✅ Best Practice

expert

What is the recommended way to avoid merge commits when running git pull?

You want to keep a clean history without merge commits when pulling remote changes. Which option achieves this?

A Use <code>git pull --squash</code> to combine all changes into one commit.

B Use <code>git pull --no-commit</code> to delay the commit after merging.

C Use <code>git pull --rebase</code> to reapply your commits on top of the remote branch.

D Use <code>git pull --force</code> to overwrite local changes.

💡 Hint

Think about replaying your work on top of updated remote commits.

git pull --rebase fetches remote changes and then reapplies your local commits on top, avoiding merge commits and keeping history linear.