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.…
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.
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.
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.
Written by
Related posts
Exploring GitHub CLI: How to interact with GitHub’s GraphQL API endpoint
Discover practical tips and tricks for forming effective GraphQL queries and mutations.
How to make your images in Markdown on GitHub adjust for dark mode and light mode
When you want your images to look good in Markdown on GitHub, you might have to adjust for the UI around them.
Cracking the code: How to wow the acceptance committee at your next tech event
Want to speak at a tech conference? These four practical tips will help your session proposal stand out—and land you on the stage.