Skip to content
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

Only allow squash merge #2542

Closed
thomasfrederikhoeck opened this issue May 27, 2024 · 3 comments
Closed

Only allow squash merge #2542

thomasfrederikhoeck opened this issue May 27, 2024 · 3 comments
Labels
enhancement New feature or request

Comments

@thomasfrederikhoeck
Copy link
Contributor

Description

Sometimes it appears that some PR are merged in with all the underlying commits which can create some noise on what was changed and it makes reverts harder. I believe squash merge should be enforced - I think this is the common way to go about for a lib like delta-rs.

image

https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-squashing-for-pull-requests

Use Case

Related Issue(s)

@thomasfrederikhoeck thomasfrederikhoeck added the enhancement New feature or request label May 27, 2024
@ion-elgreco
Copy link
Collaborator

I think the default is squash and merge, but you can still select rebase and merge. Not sure why that sometimes is selected though

@thomasfrederikhoeck
Copy link
Contributor Author

@ion-elgreco I think it is possible to disable all other kinds if you are the repo owner. I think that should be considered since right now commits on master (if not squash) doesn't directly link to PRs.

@rtyler
Copy link
Member

rtyler commented Aug 10, 2024

We recently adopted the merge queue which doesn't support squash merges, or any of the other merge styles apparently. We've been doing some squashing manually, but I'm going to close t his out since there's not much we can do until github's merge queue is more featureful

@rtyler rtyler closed this as completed Aug 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

No branches or pull requests

3 participants