When you click the default Merge pull request option on a pull request on GitHub, all commits from the feature branch are added to the base branch in a merge commit. The pull request is merged using the
To merge pull requests, you must have write permissions in the repository.
When you select the Squash and merge option on a pull request on GitHub, the pull request's commits are squashed into a single commit. Instead of seeing all of a contributor's individual commits from a topic branch, the commits are combined into one commit and merged into the default branch. Pull requests with squashed commits are merged using the fast-forward option.
To squash and merge pull requests, you must have write permissions in the repository, and the repository must allow squash merging.
You can use squash and merge to create a more streamlined Git history in your repository. Work-in-progress commits are helpful when working on a feature branch, but they aren’t necessarily important to retain in the Git history. If you squash these commits into one commit while merging to the default branch, you can retain the original changes with a clear Git history.
When you select the Rebase and merge option on a pull request on GitHub, all commits from the topic branch (or head branch) are added onto the base branch individually without a merge commit. Pull requests with rebased commits are merged using the fast-forward option.
To rebase and merge pull requests, you must have write permissions in the repository, and the repository must allow rebase merging.
The rebase and merge behavior on GitHub deviates slightly from
git rebase. Rebase and merge on GitHub will always update the committer information and create new commit SHAs, whereas
git rebase outside of GitHub does not change the committer information when the rebase happens on top of an ancestor commit. For more information about
git rebase, see the "Git rebase" chapter from the Pro Git book.
For a visual representation of
git rebase, see The "Git Branching - Rebasing" chapter from the Pro Git book.
在以下情况下，您无法在 GitHub 上自动变基与合并：
如果您仍然要变基提交，但不能在 GitHub 上自动变基与合并，则您必须：
在仓库中具有写入权限的任何人然后可以使用 GitHub 上的变基与合并按钮合并更改。