Handling PR feedback and updates in Git - Practice Problems & Coding Challenges

Challenge - 5 Problems

💻 Command Output

intermediate

What is the output of this git command after updating a PR branch?

You have a branch named feature checked out. You run git pull origin feature after pushing changes to update your local branch. What will this command output if your local branch is already up to date?

Git

git pull origin feature

A Already up to date.

B error: Your local changes to the following files would be overwritten by merge:

C Merge made by the 'recursive' strategy.

D fatal: Couldn't find remote ref feature

💡 Hint

Think about what git says when no new changes are fetched or merged.

When your local branch matches the remote branch, git pull reports 'Already up to date.' because there is nothing new to merge.

🔀 Workflow

intermediate

Which git workflow step correctly updates a PR branch after feedback?

You received feedback on your pull request and made changes locally on your feature branch. What is the correct sequence to update the remote PR branch with your new commits?

A git add . → git push origin feature → git commit -m 'fix'

B git commit -m 'fix' → git add . → git push origin feature

C git push origin feature → git add . → git commit -m 'fix'

D git add . → git commit -m 'fix' → git push origin feature

💡 Hint

Remember the order: stage changes, commit, then push.

You must first stage changes with git add, then commit them, and finally push to update the PR branch.

❓ Troubleshoot

advanced

What error occurs if you try to push to a PR branch without committing changes?

You modified files locally but forgot to commit. You run git push origin feature. What error will git show?

A error: failed to push some refs to 'origin'

B Everything up-to-date

C fatal: You have not concluded your merge (MERGE_HEAD exists).

D fatal: The current branch feature has no upstream branch.

💡 Hint

Think about what git pushes when no new commits exist.

If you have uncommitted changes, git push will not push them. It will say 'Everything up-to-date' because no new commits exist to push.

🧠 Conceptual

advanced

What is the best practice to keep your PR branch updated with the main branch before pushing changes?

You want to update your PR branch feature with the latest changes from main before pushing your fixes. Which command sequence is best?

A git checkout main → git pull origin main → git checkout feature → git merge main

B git checkout feature → git pull origin main

C git checkout feature → git rebase origin main

D git checkout main → git merge feature

💡 Hint

You want to update main first, then merge it into your feature branch.

First update your local main branch, then switch to your feature branch and merge main into it to get the latest changes.

✅ Best Practice

expert

Which git command safely updates a PR branch by replaying your commits on top of the latest main branch?

You want to update your PR branch feature with the latest main branch changes, keeping a clean history by replaying your commits. Which command do you use?

A git merge main

B git cherry-pick main

C git rebase main

D git pull origin main --no-rebase

💡 Hint

Rebasing replays commits on top of another branch.

Using git rebase main moves your commits to the tip of main, creating a linear history.