search

minkphp / webdriver-classic-driver

Mink driver for the W3C WebDriver Classic protocol
MIT License
3 stars 5 forks source link

Squash PRs #35

Closed uuf6429 closed 3 weeks ago

uuf6429 commented 3 weeks ago

@stof can you please set the default GitHub merge option to "squash"?

aik099 commented 3 weeks ago

@uuf6429 , for me if I’ve squashed last PR, then on next PR I’ll get squash merge option selected by default.

Checked in repo settings and haven’t found the setting you’ve requested.

uuf6429 commented 3 weeks ago

{397D8B20-7F4F-4FAC-AF55-F9F2ACF61578}

I guess we need to uncheck the other options then?

I realised this when I saw the relatively messy commit history for the main branch.

aik099 commented 3 weeks ago

I've found https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/about-merge-methods-on-github article explaining the usage of each of these merge strategies.

As you can see there is no way to change the default, but only to disable other merge strategies. IMO that is too much, because sometimes keeping commits of the original branch helps to understand what's going on.

Maybe you can ask GitHub Support to add such a feature?

uuf6429 commented 3 weeks ago

IMO that is too much, because sometimes keeping commits of the original branch helps to understand what's going on.

That should never happen - commit messages are (typically) internal to the branch, and in any case one can always refer back to the PR for what happened exactly (not sure about GitHub, but it might even be able to list the original commits in the PR).

In any case, there's more harm selecting the wrong merge method than there is from not being able to select merge instead of squash. And anyway, it can be changed (temporarily) in case where different behaviour is needed.

aik099 commented 3 weeks ago

Done.