On 03.12.20 14:15, Ben Kochie wrote: > I'd like to adjust our defaults for GitHub merging settings: > > Right now, we allow all three modes for PR merges. > * Merge commits > * Squash merging > * Rebase merging > > Proposal: Remove rebase merging (aka fast-forward merges) so that we stick to > merge/squash and merge.
Clearly, merge commits and squashing happens most often. I can see the occasional need for a rebase. Even though I am a firm advocate of avoiding commit rewriting whenever reasonably passible, I do think we need to keep the other options around. -- Björn Rabenstein [PGP-ID] 0x851C3DA17D748D03 [email] [email protected] -- You received this message because you are subscribed to the Google Groups "Prometheus Developers" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/prometheus-developers/20201203174707.GI3432%40jahnn.
