Re: [prometheus-developers] Lazy consensus: Merging options

2020-12-03 Thread Matthias Rampke 
… which we used to encourage inside the team.

I prefer real merging too, I like git and I don't feel the need to make
history linear.

I don't use rebase merging from PRs but I also don't think we should remove
that while allowing squash merging. I am okay with every maintainer having
their own style.

/MR

On Thu, Dec 3, 2020, 18:50 Sylvain Rabot  wrote:

> Squashing and rebasing also sucks for people who sign their commits.
>
> On Thu, 3 Dec 2020 at 16:55, Sylvain Rabot  wrote:
>
>> I also don’t like squashing.
>>
>> I don’t count the hours lost because I thought a commit referenced in a
>> merged PR was not in a tag because the squash generated a new commit id.
>>
>> On 3 Dec 2020, at 15:27, Frederic Branczyk  wrote:
>>
>> 
>> I don’t like squash merging, don’t think I’ve ever used rebase merging
>> but don’t feel too strongly about it. Merge commit is my preference.
>>
>> On Thu 3. Dec 2020 at 15:06, Julien Pivotto 
>> wrote:
>>
>>> 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 <
>>> brian.bra...@robustperception.io>
>>> > wrote:
>>> >
>>> > > On Thu, 3 Dec 2020 at 13: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.
>>> > >>
>>> > >
>>> > > 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 prometheus-developers+unsubscr...@googlegroups.com.
>>> > >> 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 prometheus-developers+unsubscr...@googlegroups.com.
>>> > > 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 prometheus-developers+unsubscr...@googlegroups.com.
>>> > 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 prometheus-developers+unsubscr...@googlegroups.com.
>>> To view this discussion on the web visit
>>> https://groups.google.com/d/msgid/prometheus-developers/20201203140641.GA543460%40oxygen
>>> .
>>>
>> --
>> 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 prometheus-developers+unsubscr...@googlegroups.com.
>> To view this discussion on the web visit
>> https://groups.google.com/d/msgid/prometheus-developers/CAOs1Umx8Ug%2BaT3sr7VEw7ryngY4Fm7Fzzdp7z6QO6ODpWXa7mQ%40mail.gmail.com
>> 
>> .

Re: [prometheus-developers] Lazy consensus: Merging options

2020-12-03 Thread Sylvain Rabot 
Squashing and rebasing also sucks for people who sign their commits.

On Thu, 3 Dec 2020 at 16:55, Sylvain Rabot  wrote:

> I also don’t like squashing.
>
> I don’t count the hours lost because I thought a commit referenced in a
> merged PR was not in a tag because the squash generated a new commit id.
>
> On 3 Dec 2020, at 15:27, Frederic Branczyk  wrote:
>
> 
> I don’t like squash merging, don’t think I’ve ever used rebase merging but
> don’t feel too strongly about it. Merge commit is my preference.
>
> On Thu 3. Dec 2020 at 15:06, Julien Pivotto 
> wrote:
>
>> 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 <
>> brian.bra...@robustperception.io>
>> > wrote:
>> >
>> > > On Thu, 3 Dec 2020 at 13: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.
>> > >>
>> > >
>> > > 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 prometheus-developers+unsubscr...@googlegroups.com.
>> > >> 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 prometheus-developers+unsubscr...@googlegroups.com.
>> > > 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 prometheus-developers+unsubscr...@googlegroups.com.
>> > 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 prometheus-developers+unsubscr...@googlegroups.com.
>> To view this discussion on the web visit
>> https://groups.google.com/d/msgid/prometheus-developers/20201203140641.GA543460%40oxygen
>> .
>>
> --
> 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 prometheus-developers+unsubscr...@googlegroups.com.
> To view this discussion on the web visit
> https://groups.google.com/d/msgid/prometheus-developers/CAOs1Umx8Ug%2BaT3sr7VEw7ryngY4Fm7Fzzdp7z6QO6ODpWXa7mQ%40mail.gmail.com
> 
> .
>
>

-- 
Sylvain Rabot 

-- 
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 prometheus-developers+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/prometheus-developers/CADjtP1EZbOzod29V309WqA%2B1S7U7cn-BRFxTPs4kszRO4w5ctA%40mail.gmail.com.

Re: [prometheus-developers] Lazy consensus: Merging options

2020-12-03 Thread Bjoern Rabenstein 
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] bjo...@rabenste.in

-- 
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 prometheus-developers+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/prometheus-developers/20201203174707.GI3432%40jahnn.

Re: [prometheus-developers] Lazy consensus: Merging options

2020-12-03 Thread Ben Kochie 
I agree, I tend to avoid squashing unless the PR author generates a really
messy set of "fix typo" commits, rather than maintaining a clean PR branch.

On Thu, Dec 3, 2020 at 4:55 PM Sylvain Rabot  wrote:

> I also don’t like squashing.
>
> I don’t count the hours lost because I thought a commit referenced in a
> merged PR was not in a tag because the squash generated a new commit id.
>
> On 3 Dec 2020, at 15:27, Frederic Branczyk  wrote:
>
> 
> I don’t like squash merging, don’t think I’ve ever used rebase merging but
> don’t feel too strongly about it. Merge commit is my preference.
>
> On Thu 3. Dec 2020 at 15:06, Julien Pivotto 
> wrote:
>
>> 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 <
>> brian.bra...@robustperception.io>
>> > wrote:
>> >
>> > > On Thu, 3 Dec 2020 at 13: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.
>> > >>
>> > >
>> > > 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 prometheus-developers+unsubscr...@googlegroups.com.
>> > >> 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 prometheus-developers+unsubscr...@googlegroups.com.
>> > > 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 prometheus-developers+unsubscr...@googlegroups.com.
>> > 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 prometheus-developers+unsubscr...@googlegroups.com.
>> To view this discussion on the web visit
>> https://groups.google.com/d/msgid/prometheus-developers/20201203140641.GA543460%40oxygen
>> .
>>
> --
> 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 prometheus-developers+unsubscr...@googlegroups.com.
> To view this discussion on the web visit
> https://groups.google.com/d/msgid/prometheus-developers/CAOs1Umx8Ug%2BaT3sr7VEw7ryngY4Fm7Fzzdp7z6QO6ODpWXa7mQ%40mail.gmail.com
> 
> .
>
>

-- 
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 prometheus-developers+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/prometheus-developers/CABbyFmr5SXckq7aWNH2PmUi%2BHbxmKb%3DmLLewLT9JMW2J8Nqydw%4

Re: [prometheus-developers] Lazy consensus: Merging options

2020-12-03 Thread Sylvain Rabot 
I also don’t like squashing.

I don’t count the hours lost because I thought a commit referenced in a merged 
PR was not in a tag because the squash generated a new commit id.

> On 3 Dec 2020, at 15:27, Frederic Branczyk  wrote:
> 
> 
> I don’t like squash merging, don’t think I’ve ever used rebase merging but 
> don’t feel too strongly about it. Merge commit is my preference. 
> 
>> On Thu 3. Dec 2020 at 15:06, Julien Pivotto  
>> wrote:
>> 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 
>> > 
>> > wrote:
>> > 
>> > > On Thu, 3 Dec 2020 at 13: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.
>> > >>
>> > >
>> > > 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 prometheus-developers+unsubscr...@googlegroups.com.
>> > >> To view this discussion on the web visit
>> > >> https://groups.google.com/d/msgid/prometheus-developers/CABbyFmp0X26pjfvyATvaUxH9p_nwBh0QSMgtJGNzfDLnZJjdMQ%40mail.gmail.com
>> > >> 
>> > >> .
>> > >>
>> > >
>> > >
>> > > --
>> > > 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 prometheus-developers+unsubscr...@googlegroups.com.
>> > > To view this discussion on the web visit
>> > > https://groups.google.com/d/msgid/prometheus-developers/CAHJKeLpwuPY6iE0k7zRP8PFAGTrEx9hYzx6j%3DQT8p4hLQVF6-w%40mail.gmail.com
>> > > 
>> > > .
>> > >
>> > 
>> > -- 
>> > 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 prometheus-developers+unsubscr...@googlegroups.com.
>> > 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 prometheus-developers+unsubscr...@googlegroups.com.
>> To view this discussion on the web visit 
>> https://groups.google.com/d/msgid/prometheus-developers/20201203140641.GA543460%40oxygen.
> 
> -- 
> 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 prometheus-developers+unsubscr...@googlegroups.com.
> To view this discussion on the web visit 
> https://groups.google.com/d/msgid/prometheus-developers/CAOs1Umx8Ug%2BaT3sr7VEw7ryngY4Fm7Fzzdp7z6QO6ODpWXa7mQ%40mail.gmail.com.

-- 
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 prometheus-developers+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/prometheus-developers/3E965868-F280-4C81-9895-D6BBFF469458%40abstraction.fr.

Re: [prometheus-developers] Lazy consensus: Merging options

2020-12-03 Thread Julien Pivotto 
On 03 Dec 16:32, Bartłomiej Płotka wrote:
> > How would you merge release branches in master?
> 
> Unpopular opinion: I would squash them. At the end there will be
> conflicts anyway, that will require this, there is zero advantage in doing
> merge commit - it just obfuscates git history to me (:
> 
> Anyway I feel like we are aiming towards both Squash AND Merge options (:

Are you dismissing Brian's comment?

There is a big advantage in merge commit for releases, which is to be
able to see which branches has been merged.

No, the solution for conflit is not squash, it is manual merge commit.

> 
> Kind Regards,
> Bartek Płotka (@bwplotka)
> 
> 
> On Thu, 3 Dec 2020 at 16:11, Brian Brazil 
> wrote:
> 
> > On Thu, 3 Dec 2020 at 14:27, Frederic Branczyk 
> > wrote:
> >
> >> I don’t like squash merging, don’t think I’ve ever used rebase merging
> >> but don’t feel too strongly about it. Merge commit is my preference.
> >>
> >
> > Many PRs I see end up with lots of tiny commits as part of the review
> > process that need to be squashed. I find it's handy to be able to do all of
> > that when I merge (and also fix up the commit description), rather than
> > doing another roundtrip with the author.
> >
> > Brian
> >
> >
> >>
> >> On Thu 3. Dec 2020 at 15:06, Julien Pivotto 
> >> wrote:
> >>
> >>> 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 <
> >>> brian.bra...@robustperception.io>
> >>> > wrote:
> >>> >
> >>> > > On Thu, 3 Dec 2020 at 13: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.
> >>> > >>
> >>> > >
> >>> > > 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 prometheus-developers+unsubscr...@googlegroups.com.
> >>> > >> 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 prometheus-developers+unsubscr...@googlegroups.com.
> >>> > > 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 prometheus-developers+unsubscr...@googlegroups.com.
> >>> > 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 prometheus-developers+unsubscr...@googlegroups.com.
> >>> To view this discussion on the web visit
> >>> https://groups.google.com/d/msgid/prometheus-developers/20201203140641.GA543460%40oxygen
> >>> .
> >>>
> >>
> >
> > --
> > Brian Brazil
> > www.rob

Re: [prometheus-developers] Lazy consensus: Merging options

2020-12-03 Thread Bartłomiej Płotka 
> How would you merge release branches in master?

Unpopular opinion: I would squash them. At the end there will be
conflicts anyway, that will require this, there is zero advantage in doing
merge commit - it just obfuscates git history to me (:

Anyway I feel like we are aiming towards both Squash AND Merge options (:

Kind Regards,
Bartek Płotka (@bwplotka)


On Thu, 3 Dec 2020 at 16:11, Brian Brazil 
wrote:

> On Thu, 3 Dec 2020 at 14:27, Frederic Branczyk 
> wrote:
>
>> I don’t like squash merging, don’t think I’ve ever used rebase merging
>> but don’t feel too strongly about it. Merge commit is my preference.
>>
>
> Many PRs I see end up with lots of tiny commits as part of the review
> process that need to be squashed. I find it's handy to be able to do all of
> that when I merge (and also fix up the commit description), rather than
> doing another roundtrip with the author.
>
> Brian
>
>
>>
>> On Thu 3. Dec 2020 at 15:06, Julien Pivotto 
>> wrote:
>>
>>> 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 <
>>> brian.bra...@robustperception.io>
>>> > wrote:
>>> >
>>> > > On Thu, 3 Dec 2020 at 13: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.
>>> > >>
>>> > >
>>> > > 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 prometheus-developers+unsubscr...@googlegroups.com.
>>> > >> 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 prometheus-developers+unsubscr...@googlegroups.com.
>>> > > 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 prometheus-developers+unsubscr...@googlegroups.com.
>>> > 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 prometheus-developers+unsubscr...@googlegroups.com.
>>> To view this discussion on the web visit
>>> https://groups.google.com/d/msgid/prometheus-developers/20201203140641.GA543460%40oxygen
>>> .
>>>
>>
>
> --
> 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 prometheus-developers+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/prometheus-developers/CAMssQwZ0MJ2gJiw1jp--gbQBVqdLzGuVxRSM6wP7TZfYes9tRA%40mail.gmail.com.

Re: [prometheus-developers] Lazy consensus: Merging options

2020-12-03 Thread Brian Brazil 
On Thu, 3 Dec 2020 at 14:27, Frederic Branczyk  wrote:

> I don’t like squash merging, don’t think I’ve ever used rebase merging but
> don’t feel too strongly about it. Merge commit is my preference.
>

Many PRs I see end up with lots of tiny commits as part of the review
process that need to be squashed. I find it's handy to be able to do all of
that when I merge (and also fix up the commit description), rather than
doing another roundtrip with the author.

Brian


>
> On Thu 3. Dec 2020 at 15:06, Julien Pivotto 
> wrote:
>
>> 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 <
>> brian.bra...@robustperception.io>
>> > wrote:
>> >
>> > > On Thu, 3 Dec 2020 at 13: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.
>> > >>
>> > >
>> > > 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 prometheus-developers+unsubscr...@googlegroups.com.
>> > >> 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 prometheus-developers+unsubscr...@googlegroups.com.
>> > > 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 prometheus-developers+unsubscr...@googlegroups.com.
>> > 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 prometheus-developers+unsubscr...@googlegroups.com.
>> To view this discussion on the web visit
>> https://groups.google.com/d/msgid/prometheus-developers/20201203140641.GA543460%40oxygen
>> .
>>
>

-- 
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 prometheus-developers+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/prometheus-developers/CAHJKeLqOu9voLvBO0Mvfrj-z%2BX0HYsotvP%3DbJmMak9j-wN%3DbSQ%40mail.gmail.com.

Re: [prometheus-developers] Lazy consensus: Merging options

2020-12-03 Thread Frederic Branczyk 
I don’t like squash merging, don’t think I’ve ever used rebase merging but
don’t feel too strongly about it. Merge commit is my preference.

On Thu 3. Dec 2020 at 15:06, Julien Pivotto 
wrote:

> 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 <
> brian.bra...@robustperception.io>
> > wrote:
> >
> > > On Thu, 3 Dec 2020 at 13: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.
> > >>
> > >
> > > 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 prometheus-developers+unsubscr...@googlegroups.com.
> > >> 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 prometheus-developers+unsubscr...@googlegroups.com.
> > > 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 prometheus-developers+unsubscr...@googlegroups.com.
> > 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 prometheus-developers+unsubscr...@googlegroups.com.
> To view this discussion on the web visit
> https://groups.google.com/d/msgid/prometheus-developers/20201203140641.GA543460%40oxygen
> .
>

-- 
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 prometheus-developers+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/prometheus-developers/CAOs1Umx8Ug%2BaT3sr7VEw7ryngY4Fm7Fzzdp7z6QO6ODpWXa7mQ%40mail.gmail.com.

Re: [prometheus-developers] Lazy consensus: Merging options

2020-12-03 Thread Julien Pivotto 
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 
> wrote:
> 
> > On Thu, 3 Dec 2020 at 13: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.
> >>
> >
> > 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 prometheus-developers+unsubscr...@googlegroups.com.
> >> To view this discussion on the web visit
> >> https://groups.google.com/d/msgid/prometheus-developers/CABbyFmp0X26pjfvyATvaUxH9p_nwBh0QSMgtJGNzfDLnZJjdMQ%40mail.gmail.com
> >> 
> >> .
> >>
> >
> >
> > --
> > 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 prometheus-developers+unsubscr...@googlegroups.com.
> > To view this discussion on the web visit
> > https://groups.google.com/d/msgid/prometheus-developers/CAHJKeLpwuPY6iE0k7zRP8PFAGTrEx9hYzx6j%3DQT8p4hLQVF6-w%40mail.gmail.com
> > 
> > .
> >
> 
> -- 
> 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 prometheus-developers+unsubscr...@googlegroups.com.
> 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 prometheus-developers+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/prometheus-developers/20201203140641.GA543460%40oxygen.

Re: [prometheus-developers] Lazy consensus: Merging options

2020-12-03 Thread Bartłomiej Płotka 
I am ok with this proposal.

Long term I would even vote for squash only, but we discussed this in the
past.

Kind Regards,
Bartek Płotka (@bwplotka)


On Thu, 3 Dec 2020 at 14:20, Brian Brazil 
wrote:

> On Thu, 3 Dec 2020 at 13: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.
>>
>
> 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 prometheus-developers+unsubscr...@googlegroups.com.
>> To view this discussion on the web visit
>> https://groups.google.com/d/msgid/prometheus-developers/CABbyFmp0X26pjfvyATvaUxH9p_nwBh0QSMgtJGNzfDLnZJjdMQ%40mail.gmail.com
>> 
>> .
>>
>
>
> --
> 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 prometheus-developers+unsubscr...@googlegroups.com.
> To view this discussion on the web visit
> https://groups.google.com/d/msgid/prometheus-developers/CAHJKeLpwuPY6iE0k7zRP8PFAGTrEx9hYzx6j%3DQT8p4hLQVF6-w%40mail.gmail.com
> 
> .
>

-- 
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 prometheus-developers+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/prometheus-developers/CAMssQwahWTP3uPQuEDcu8jQB_EBDe5AOKXrJYd6%2Bad-wqOpEFQ%40mail.gmail.com.

Re: [prometheus-developers] Lazy consensus: Merging options

2020-12-03 Thread Brian Brazil 
On Thu, 3 Dec 2020 at 13: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.
>

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 prometheus-developers+unsubscr...@googlegroups.com.
> To view this discussion on the web visit
> https://groups.google.com/d/msgid/prometheus-developers/CABbyFmp0X26pjfvyATvaUxH9p_nwBh0QSMgtJGNzfDLnZJjdMQ%40mail.gmail.com
> 
> .
>


-- 
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 prometheus-developers+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/prometheus-developers/CAHJKeLpwuPY6iE0k7zRP8PFAGTrEx9hYzx6j%3DQT8p4hLQVF6-w%40mail.gmail.com.

[prometheus-developers] Lazy consensus: Merging options

2020-12-03 Thread Ben Kochie 
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.

[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 prometheus-developers+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/prometheus-developers/CABbyFmp0X26pjfvyATvaUxH9p_nwBh0QSMgtJGNzfDLnZJjdMQ%40mail.gmail.com.