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.…
|
1 minutes
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
How to review code effectively: A GitHub staff engineer’s philosophy
GitHub Staff Engineer Sarah Vessels discusses her philosophy of code review, what separates good code review from bad, her strategy for finding and reviewing code, and how to get the most from reviews of her own code.
Beginner’s guide to GitHub: Uploading files and folders to GitHub
The next step in our GitHub for Beginners series is learning how to add files and folders to your GitHub repository.
Beginner’s guide to GitHub repositories: How to create your first repo
Git started on your first repository in the third installment of GitHub for Beginners. Discover the essential features and settings to manage your projects effectively.