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

Making "squash merging" default #459

Closed
jakirkham opened this issue Nov 29, 2021 · 5 comments
Closed

Making "squash merging" default #459

jakirkham opened this issue Nov 29, 2021 · 5 comments

Comments

@jakirkham
Copy link
Member

After merging a PR recently, noticed other PRs here have been merged with "squash merging". Should we make this the default and/or only merge method?

No strong feelings personally. Just wondering how we can make it easier to do the expected merge behavior.

@jakirkham
Copy link
Member Author

@ogrisel @pierreglaser ?

@pierreglaser
Copy link
Member

I'm fine with squash merging being the default.

@jrbourbeau
Copy link
Member

Whoops I think #450 might be to blame for the recent not-so-informative commits : ) FWIW we've standardized on squash merging over in Dask (as @jakirkham is well aware) and I think folks have been happy with that decision. GitHub allows you to explicitly disable various types of merging on PRs (see https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-squashing-for-pull-requests) so all but "Squash and merge" could be disabled

@jakirkham
Copy link
Member Author

Yep I dropped the ball there and clicked the merge button, which prompted this question 😅

@jakirkham
Copy link
Member Author

Have gone ahead and made this change. Though please feel free to comment if you have thoughts here (this can always be changed again)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants