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
Hack the World: Why hackathons are still the best place to learn to build
The barriers to building software have collapsed. Today, anyone can build. Hackathons are a great place to start learning.
AI is changing developer work. Here are three skills to strengthen.
Learn to direct AI agents, critically review their output, and keep technical judgment at the center of your workflow.
From coder to orchestrator: How agents shift the role of a developer
Developers are owning more of the delivery system around code, not just code itself. Join us during GitHub Universe to meet other devs, learn something new, and explore what’s next.