On 03 Dec 14:59, Bartłomiej Płotka wrote: > I am ok with this proposal. > > Long term I would even vote for squash only, but we discussed this in the > past.
How would you merge release branches in master? > > Kind Regards, > Bartek Płotka (@bwplotka) > > > On Thu, 3 Dec 2020 at 14:20, Brian Brazil <[email protected]> > wrote: > > > On Thu, 3 Dec 2020 at 13:15, Ben Kochie <[email protected]> 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. > >> > > > > I use rebase merges sometimes to keep the history clean from > > unnecessary merge commits, so I'd like it to hang around. > > > > Brian > > > > > >> > >> [image: image.png] > >> > >> -- > >> 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/CABbyFmp0X26pjfvyATvaUxH9p_nwBh0QSMgtJGNzfDLnZJjdMQ%40mail.gmail.com > >> <https://groups.google.com/d/msgid/prometheus-developers/CABbyFmp0X26pjfvyATvaUxH9p_nwBh0QSMgtJGNzfDLnZJjdMQ%40mail.gmail.com?utm_medium=email&utm_source=footer> > >> . > >> > > > > > > -- > > Brian Brazil > > www.robustperception.io > > > > -- > > 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/CAHJKeLpwuPY6iE0k7zRP8PFAGTrEx9hYzx6j%3DQT8p4hLQVF6-w%40mail.gmail.com > > <https://groups.google.com/d/msgid/prometheus-developers/CAHJKeLpwuPY6iE0k7zRP8PFAGTrEx9hYzx6j%3DQT8p4hLQVF6-w%40mail.gmail.com?utm_medium=email&utm_source=footer> > > . > > > > -- > 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/CAMssQwahWTP3uPQuEDcu8jQB_EBDe5AOKXrJYd6%2Bad-wqOpEFQ%40mail.gmail.com. -- Julien Pivotto @roidelapluie -- 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/20201203140641.GA543460%40oxygen.
