From: andy pugh
Sent: November 30, 2022 12:11 PM
To: EMC developers
Subject: Re: [Emc-developers] Merge Strategy
On Wed, 30 Nov 2022 at 12:04, Chris Morley
wrote:
I presented my idea to see if anyone could show a fatal flaw of it so I
> appreciate the discuss
We could possibly establish a "forgotten but still pressing PR"-committee that
submitters can call when they (I mean, their patches) feel neglected?
Best,
Steffen
To be clear, I was discussing strategy of branch-to-branch merges not pull
request merges.
Chris
> Von: "Chris Morley"
> An: "EMC developers"
> Betreff: Re: [Emc-developers] Merge Strategy
>
> Our current strategy has not been always right in the past.
> I have occasionally had to fix merges after the fact because someone merged
> them wrong.
> (
On Wed, 30 Nov 2022 at 12:04, Chris Morley
wrote:
I presented my idea to see if anyone could show a fatal flaw of it so I
> appreciate the discussion/feedback.
I think the only advantage of our current strategy (and it's not a good
one) is that if things get forgotten then they will still be
-developers] Merge Strategy
On Wed, 30 Nov 2022 at 07:38, Chris Morley
wrote:
>
> The only solution, given our current strategy, is to wait/ask for someone
> else to fix it.
> This is the crux of the problem.
I think that our current merge-up strategy has been right in the past and
will be
On Wed, 30 Nov 2022 at 07:38, Chris Morley
wrote:
>
> The only solution, given our current strategy, is to wait/ask for someone
> else to fix it.
> This is the crux of the problem.
I think that our current merge-up strategy has been right in the past and
will be right again, but currently
From: Hans Unzner
Sent: November 29, 2022 6:35 PM
To: emc-developers@lists.sourceforge.net
Subject: Re: [Emc-developers] Merge Strategy
>>
>> Then email the folks who know more about the conflict and ask them to
>> merge their bugfix into
Am 28.11.22 um 02:44 schrieb Sebastian Kuzminsky:
I still think merging upwards is the best way to do this.
The main advantage is that git keeps track of what commits need to be
propagated to the newer branch, so we'll never leave behind any bugfix
commits in older stable branches. This
-08:00)
To: emc-developers@lists.sourceforge.net
Subject: Re: [Emc-developers] Merge Strategy
> Gesendet: Montag, 28. November 2022 um 06:43 Uhr
> Von: "Chris Morley"
> An: "EMC developers"
> Betreff: Re: [Emc-developers] Merge Strategy
>
> Can you explai
> Gesendet: Montag, 28. November 2022 um 06:43 Uhr
> Von: "Chris Morley"
> An: "EMC developers"
> Betreff: Re: [Emc-developers] Merge Strategy
>
> Can you explain why merging up is better then cherry-picking or separate
> commits?
@Seb ex
To: emc-developers@lists.sourceforge.net
Subject: Re: [Emc-developers] Merge Strategy
IMHO we should continue with the merge-up and start thinking again when there
is a change to 2.9 that should not be forwarded.
Best,
Steffen
> Gesendet: Sonntag, 27. November 2022 um 19:11 Uhr
> Von: "C
___
From: Hans Unzner
Sent: November 27, 2022 10:54 AM
To: emc-developers@lists.sourceforge.net
Subject: Re: [Emc-developers] Merge Strategy
I agree that we should stick to "merge up" until we reach an agreement
to change this.
Hans
Am 23.11.22 um 22:42 schrieb Chri
IMHO we should continue with the merge-up and start thinking again when there
is a change to 2.9 that should not be forwarded.
Best,
Steffen
> Gesendet: Sonntag, 27. November 2022 um 19:11 Uhr
> Von: "Chris Morley"
> An: "EMC developers"
> Betreff: Re: [Emc-dev
Well we will never agree on anything different if we never discuss it.
How about throwing out an opinion here?
Chris
From: Hans Unzner
Sent: November 27, 2022 10:54 AM
To: emc-developers@lists.sourceforge.net
Subject: Re: [Emc-developers] Merge Strategy
I agree
nc.
Chris
From: andy pugh
Sent: November 23, 2022 4:59 PM
To: EMC developers
Subject: [Emc-developers] Merge Strategy
On Tue, 8 Nov 2022 at 21:38, Chris Morley wrote:
I wonder if we might discuss a different merging strategy for 2 9/master.
This would be relative to work
-then-current-release (I realize that
2.8 is still sorta current)
On the absence of an agreement, I am merging up 2.9 to master to keep in sync.
Chris
From: andy pugh
Sent: November 23, 2022 4:59 PM
To: EMC developers
Subject: [Emc-developers] Merge Strategy
On Tue, 8
On Tue, 8 Nov 2022 at 21:38, Chris Morley wrote:
>
> I wonder if we might discuss a different merging strategy for 2 9/master.
> This would be relative to work being done in 2.9 for release.
>
> I suggest we don't merge up any more.
> Cherry pick or a separate commit makes more sense to me.
>
17 matches
Mail list logo
