Hence I thought you would be the best placed to answer my interrogations.
I am certainly not the appropriate person to target for "interrogations" on this matter. It is a long-standing practice in the community, and a feature GitHub has in their GUI to create separate merge commits even when there is only a single commit in the PR. If SciPy or the community strongly prefers not to do it, then I'll switch to squashing, but until then I strongly disagree that I should have to defend PRs where I do that. Tyler On Tue, 24 Aug 2021 at 08:32, Pamphile Roy <roy.pamphile@gmail.com> wrote:
On 24.08.2021, at 16:05, Tyler Reddy <tyler.je.reddy@gmail.com> wrote:
Hi all,
I recently received some criticism for merging a PR that had only 1 commit and producing a single merge commit on top of it (this happens to be the default option I have/what I've been doing for years). See here: https://github.com/scipy/scipy/pull/14630
I'd like to mention a few things here: - are we still "ok" with folks doing this? frankly, I find taking heat for precise merging philosophy a bit unwelcoming even as someone who has been contributing for a while; sometimes it is important to squash 100 messy commits, but otherwise do a good job reviewing PRs and relaxing on the purist "git history" attacks seem a bit more welcoming to me - I find those merge commits somewhat useful when navigating back to GitHub anyway, maybe because I'm so used to them - why does GitHub allow us to do this if it really isn't useful at all?
Hi Tyler,
I am sorry that you saw an attack in my comment.
That was not my intention and I strongly think that it is not what my message and replies convey.
The essence of my comment was: why merge instead of squash for a single commit. I asked you directly for 2 reasons: one, it’s on one of my PR; two, I saw you do this on multiple PRs. Hence I thought you would be the best placed to answer my interrogations.
As I said, if it’s for the authorship and presence in the history (which I totally agree, when reviewing you should be in the history. I even opened a feature request on GitHub: https://github.com/github/feedback/discussions/4525), then I suggest to use the “Co-authored-by” feature.
As for the default, GitHub is considering the last action you did. If you merged a PR, next time it will show you “Merge Pull Request”. In my case for instance, I last “Squash and merge” and GitHub is showing me this. You can just click on the arrow to change this.
Pamphile _______________________________________________ SciPy-Dev mailing list SciPy-Dev@python.org https://mail.python.org/mailman/listinfo/scipy-dev
