Rebase and merge pull requests

The merge button on pull requests supports two great workflows with merge commits and commit squashing. Now you can use the merge button to rebase and merge your changes, too.

Rebase

How does it work?

When you select the new “Rebase and merge” option, the commits from the pull request’s branch are rebased on to the tip of the base branch, and then the base branch itself is fast forwarded to this newly rebased head. Rebases automatically set the committer of the rebased commits to the current user, while keeping authorship information intact. The pull request’s branch will not be modified by this operation.

If a rebase can’t be performed due to conflicts, we’ll let you know so you can manually resolve them as necessary.

Rebase with conflicts

As with “Squash and merge”, repository administrators can decide whether they want to allow this new option on the repository settings page.

Learn more about rebase and merge in our Help docs.

Have feedback on this post? Let @github know on Twitter.
Need help or found a bug? Contact us.

Changelog

Subscribe

GitHub Universe logo

GitHub Universe

October 16-17 in San Francisco
Get tickets today

Discover new ways to build better

Try Marketplace apps free for 14 days

Learn more