Handling PR feedback and updates in Git - Cheat Sheet & Quick Revision

Recall & Review

beginner

What is a Pull Request (PR) in Git?

A Pull Request is a way to ask team members to review and merge your code changes into the main project branch. It helps keep code organized and reviewed before adding it.

beginner

How do you update your PR branch after receiving feedback?

You make changes locally, commit them, and then push the updates to the same branch. The PR will automatically update with your new commits.

intermediate

What command do you use to fetch the latest changes from the main branch before updating your PR branch?

Use `git fetch origin` to get the latest changes, then `git rebase origin/main` to apply your changes on top of the updated main branch.

intermediate

Why is it important to rebase your PR branch before merging?

Rebasing keeps your branch up to date with the main branch and creates a clean, linear history. This makes it easier to review and avoids merge conflicts.

beginner

How do you respond to feedback that requires multiple changes?

Make each change in your local branch, commit them with clear messages, and push all commits to the PR branch. This keeps feedback organized and easy to track.

What happens when you push new commits to a branch with an open PR?

A The PR closes automatically.

B You must create a new PR for the new commits.

C The new commits are ignored.

D The PR updates automatically with the new commits.

When you push new commits to the branch linked to a PR, the PR updates automatically to include those commits.

Which command updates your local branch with the latest changes from the main branch?

A git rebase origin/main

B git push origin main

C git clone main

D git commit --amend

The command 'git rebase origin/main' applies your changes on top of the latest main branch, updating your branch.

Why should you keep commit messages clear when updating a PR?

A To make the commit history confusing.

B To help reviewers understand what changed.

C To avoid pushing changes.

D To delete previous commits.

Clear commit messages help reviewers quickly understand the purpose of each change.

What is the best practice if your PR branch has conflicts with the main branch?

A Push your branch without resolving conflicts.

B Delete your branch and start over.

C Rebase your branch onto the main branch and resolve conflicts.

D Ignore the conflicts and merge anyway.

Rebasing and resolving conflicts ensures your branch is compatible with the main branch before merging.

How do you handle multiple rounds of feedback on a PR?

A Make changes, commit, and push updates to the same PR branch.

B Close the PR and open a new one for each change.

C Ignore the feedback.

D Delete your branch after each change.

You update the same PR branch with new commits for each round of feedback to keep the review process smooth.

Explain the steps to update your PR branch after receiving feedback.

Think about how you work on your computer and share changes with your team.

Describe why rebasing your PR branch before merging is helpful.

Imagine organizing papers in a neat stack before handing them over.