-
Notifications
You must be signed in to change notification settings - Fork 53
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Enable auto squashing of commits in GitHub #132
Comments
Yes please! Multiple commits are super useful during review time ("show changes since your last review" and even better, if people organize the commits logically). But squashing would be best for the final merge. |
From @SimonTheLeg
(example taken from kubermatic/kubermatic@022ca1e) |
We can have both, actually all three options really (merge, squash, rebase). Tide has configuration option to have designated labels make it switch merging type. If you label PR with (label name is configurable) let's say 'tide/merge-method-squash' it will squash commits and and github automatically preserves authors as coauthors and commit message is concatenated from included commits. |
After some thinking, let's make squash default method. |
Thanks @radoslawc . I assume this is done now. Does it use PR message and description as commit messages? |
A PR could potentially contain multiple commts. Squashing all the commits before merging could maintain a cleaner history of code changes.
@SimonTheLeg has shown how this can be done automatically in GitHub and how PR title and description could be used as final commit messages. It also maintains the names of all authors.
Once we get a wider buy in for this , we can implement it for all nephio repos.
The text was updated successfully, but these errors were encountered: