Pull request process in Git - Cheat Sheet & Quick Revision

Recall & Review

beginner

What is a pull request in Git?

A pull request is a way to ask to merge your code changes from one branch into another, usually from a feature branch into the main branch. It lets others review your changes before adding them.

beginner

Why do teams use pull requests?

Teams use pull requests to review code, catch mistakes early, discuss improvements, and keep the main code safe and clean.

beginner

What are the typical steps in a pull request process?

1. Create a feature branch and make changes.
2. Push the branch to the remote repository.
3. Open a pull request to merge changes.
4. Team reviews the code.
5. Address feedback and update the pull request.
6. Merge the pull request when approved.

intermediate

What happens if reviewers request changes on a pull request?

You update your code on the same branch, push the changes, and the pull request updates automatically. Reviewers then check the new changes.

beginner

What is the difference between merging and closing a pull request?

Merging adds your changes to the target branch. Closing without merging means your changes are not added and the pull request is discarded.

What is the first step to start a pull request?

A Create a feature branch and make changes

B Merge the main branch

C Delete the repository

D Close an existing pull request

You start by creating a feature branch and making your code changes there before opening a pull request.

Who usually reviews a pull request?

A Random internet users

B Team members or collaborators

C Only the person who created it

D The operating system

Team members or collaborators review pull requests to ensure code quality and correctness.

What should you do if your pull request gets feedback requesting changes?

A Create a new repository

B Delete your branch immediately

C Update your code and push changes to the same branch

D Ignore the feedback

You update your code on the same branch and push the changes; the pull request updates automatically.

What does merging a pull request do?

A Deletes your feature branch

B Creates a new branch

C Closes the repository

D Adds your changes to the target branch

Merging adds the changes from your feature branch into the target branch, usually main or master.

What happens if you close a pull request without merging?

A Your changes are not added to the target branch

B Your changes are merged automatically

C Your branch is deleted

D The repository is archived

Closing without merging means your changes are discarded and not added to the target branch.

Explain the pull request process from creating a branch to merging changes.

Think about the steps you take to safely add your code to the main project.

Why is code review important in the pull request process?

Consider how teamwork helps make better software.

Practice

1. What is the main purpose of a pull request in Git?

easy

A. To ask your team to review and merge your code changes

B. To delete a branch from the repository

C. To create a new branch locally

D. To clone a repository to your computer

Solution

1. Step 1: Understand the role of a pull request

   A pull request is a request to merge code changes and get feedback from the team.

2. Step 2: Identify the correct purpose

   Options B, C, and D describe other Git actions unrelated to pull requests.

3. Final Answer:

   To ask your team to review and merge your code changes -> Option A

4. Quick Check:

   Pull request = code review request [OK]

Hint: Pull request means asking for code review and merge [OK]

Common Mistakes:

• Confusing pull request with branch creation
• Thinking pull request deletes branches
• Mixing pull request with cloning repositories

2. Which Git command is used to upload your local branch to the remote repository before creating a pull request?

easy

A. git clone origin branch-name

B. git pull origin branch-name

C. git push origin branch-name

D. git fetch origin branch-name

Solution

1. Step 1: Identify the command to upload local changes

   The git push command sends local commits to the remote repository.

2. Step 2: Match the correct syntax

   git push origin branch-name uploads the specified branch to the remote named origin.

3. Final Answer:

   git push origin branch-name -> Option C

4. Quick Check:

   Push = upload branch to remote [OK]

Hint: Push uploads your branch to remote before pull request [OK]

Common Mistakes:

• Using git clone instead of git push
• Confusing git pull with git push
• Using git fetch which only downloads data

3. After pushing your branch and creating a pull request, what is the expected output when you run git status on your local branch?

medium

A. On branch feature-xyz
nothing to commit, working tree clean

B. On branch feature-xyz
your branch is ahead of 'origin/feature-xyz' by 1 commit

C. On branch main
nothing to commit, working tree clean

D. On branch feature-xyz
You have unmerged paths.

Solution

1. Step 1: Understand the state after pushing and creating pull request

   After pushing, local and remote branches are synced, so no new commits locally.

2. Step 2: Interpret git status output

   "nothing to commit, working tree clean" means no changes locally; branch is up to date.

3. Final Answer:

   On branch feature-xyz nothing to commit, working tree clean -> Option A

4. Quick Check:

   Clean status means local branch matches remote [OK]

Hint: Clean git status means branch is synced after push [OK]

Common Mistakes:

• Thinking branch is ahead after push
• Confusing branch names
• Expecting unmerged paths without conflicts

4. You created a pull request but forgot to push your latest commit. What error will you most likely see when trying to create the pull request?

medium

A. Pull request created successfully with all commits

B. Error: No commits found on branch to compare

C. Merge conflict detected automatically

D. Remote branch does not exist

Solution

1. Step 1: Understand the pull request creation process

   A pull request compares your remote branch with the base branch.

2. Step 2: Identify the error when branch is not pushed

   If you forget to push, the remote branch does not exist, causing an error.

3. Final Answer:

   Remote branch does not exist -> Option D

4. Quick Check:

   Pull request needs remote branch [OK]

Hint: Push branch first or remote branch won't exist [OK]

Common Mistakes:

• Assuming pull request works without pushing
• Expecting merge conflict before push
• Ignoring remote branch creation step

5. You want to ensure your pull request is merged only after at least two team members approve it. Which GitHub feature should you configure?

hard

A. Enable auto-merge without reviews

B. Branch protection rules with required reviews set to 2

C. Use git rebase to combine commits

D. Create a new branch for each reviewer

Solution

1. Step 1: Identify how to enforce review requirements

   GitHub branch protection rules allow setting required number of reviewers before merge.

2. Step 2: Match the feature to the requirement

   Setting required reviews to 2 ensures at least two approvals before merging.

3. Final Answer:

   Branch protection rules with required reviews set to 2 -> Option B

4. Quick Check:

   Branch protection = enforce review count [OK]

Hint: Use branch protection rules to require reviews [OK]

Common Mistakes:

• Confusing auto-merge with review enforcement
• Thinking git rebase controls reviews
• Creating branches per reviewer is unnecessary