问题
Let's say I have a commit history with 5 commits. I know that I can rebase my commits locally when making a pull request which will then have them rebased into a single commit.
A common use case for this is:
- Make local commits, working on feature
- Squash commits
- Make Pull Request
- Receive review comments
- Update PR appropriately
I can do this locally on my machine and then push my change again (using -f since the rebase makes it out of sync with the remote). This is kind of annoying.
However, this requires that I do a rebase every time I address review comments - is there any way I can do this from the web interface?
Or maybe my workflow is wrong, should I be amending each of my "review comments" commits directly onto the main PR commit?
回答1:
You don't have to do any rebase/squashing locally anymore: just push your commit to your PR branch.
The owner of the original repo, if he/she chose to, will squash those commits for you (since March 2016):
See "Squash your commits" and the documentation: it does allow for a new workflow, both for you the contributor, and the maintainer of the original repo.
As I comment below: it will be implemented like the merge of a PR is implemented:
- If it works without conflict, the merge (or here, the
merge --squash: see "In git, what is the difference between merge --squash and rebase?") will be created automatically. - If there is any conflict, the merge is not created, and the maintainer has the option to reject for now the PR, asking the contributor to do the work of squashing the commits and amending the PR.
This is really like what exists now, except GitHub has added the --squash to their merge command. Nothing more.
来源：https://stackoverflow.com/questions/35948131/github-squash-commits-from-web-interface-on-pull-request-after-review-comments