Can you explain why merging up is better then cherry-picking or separate
commits?
Merge strategy should not change based on what should or should not be moved
forward.
The strategy must be the same.
Chris
From: Steffen Möller
Sent: November 28, 2022 1:04 AM
To:
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 avoids the terrible situation
where we fix a bug in
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-developers] Merge Strategy
>
> Well
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
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 Chris Morley:
Ya it's always been hard to consistently get answers in our project.
It just seems the nature of our group.
Thanks for continuing to try.
Currently strategy
