Merging a pull request

About pull request merges

In a pull request, you propose that changes you've made on a head branch should be merged into a base branch. By default, any pull request can be merged at any time, unless the head branch is in conflict with the base branch. However, there may be restrictions on when you can merge a pull request into a specific branch. For example, you may only be able to merge a pull request into master if required status checks are passing. For more information, see "About protected branches."

If the pull request has merge conflicts, or if you'd like to test the changes before merging, you can check out the pull request locally and merge it using the command line.

You can't merge a draft pull request. For more information about draft pull requests, see "About pull requests."

If you decide you don't want the changes in a topic branch to be merged to the upstream branch, you can close the pull request without merging.

Merging a pull request on GitHub

1. Under your repository name, click Pull requests.

   

2. In the "Pull Requests" list, click the pull request you'd like to merge.

3. Depending on the merge options enabled for your repository, you can:

   • Merge all of the commits into the base branch by clicking Merge pull request. If the Merge pull request option is not shown, then click the merge drop down menu and select Create a merge commit.
     
   • Squash the commits into one commit by clicking the merge drop down menu, selecting Squash and merge and then clicking the Squash and merge button.
     
   • Rebase the commits individually onto the base branch by clicking the merge drop down menu, selecting Rebase and merge and then clicking the Rebase and merge button.
     

   Note: Rebase and merge will always update the committer information and create new commit SHAs. For more information, see "About pull request merges."

4. If prompted, type a commit message, or accept the default message.

   

5. Click Confirm merge, Confirm squash and merge, or Confirm rebase and merge.

6. Optionally, delete the branch. This keeps the list of branches in your repository tidy.

Pull requests are merged using the --no-ff option, except for pull requests with squashed or rebased commits, which are merged using the fast-forward option.

You can link a pull request to an issue to automatically close the issue when someone merges the pull request. For more information, see "Linking a pull request to an issue."

Further reading

• "Reverting a pull request"
• "Syncing your branch" using GitHub Desktop
• "About pull request merges"
• "Addressing merge conflicts"