search

gnudatalanguage / gdl

GDL - GNU Data Language
GNU General Public License v2.0
274 stars 61 forks source link

disallow non-squash merge modes on GitHub? #1754

Closed slayoo closed 6 months ago

slayoo commented 6 months ago

GitHub has the "Generate release notes" button on the release creation page which fills the text panel with a list of commits since last release. This is great, and would help fill with contents the "Release notes" for users, packagers and developers alike. However, in practice it requires the project to shift to "Squash" mode when merging PRs (otherwise, the release notes are cluttered with numerous minor commits done while polishing PRs and also with the merge commits). Squash merging results in each PR - even if it contains 100 commits - being merged as one single commit bearing the name of the PR. I'd say it would likely be worth embracing for GDL.

Currently it is an option while merging. Probably the most robust way to embrace it project wise would be to disallow any other merge modes at: https://github.com/gnudatalanguage/gdl/settings#merge-button-settings (currently we allow: merge commits; squash merges; rebase merges).

@GillesDuvert, @pjb7687, @alaingdl, any thoughts?

pjb7687 commented 6 months ago

Hi, for me it sounds good to me. Should we do this?

GillesDuvert commented 6 months ago

As I often save many intermediate version to GH, this "squash merge" mode seems indeed preferable.

slayoo commented 6 months ago

OK, just made this change in the repo settings: image In case, this needs to be reverted, these settings are at: https://github.com/gnudatalanguage/gdl/settings#merge-button-settings