Guten Tag Stephen Webb,
am Dienstag, 4. Januar 2022 um 04:51 schrieben Sie:
> Once the branches diverge, git cherry-pick is the better merge process.
They have diverged already and all changes from master were decided to
be useful in next_stable. So the results of cherry-picking and
merging would
Once the branches diverge, git cherry-pick is the better merge process.
On Tue, Jan 4, 2022 at 11:06 AM Robert Middleton
wrote:
> Just as a note to all, what I've been doing with next_stable is to
> periodically merge master back in once I make fixes on master(assuming
> that those fixes are com
Just as a note to all, what I've been doing with next_stable is to
periodically merge master back in once I make fixes on master(assuming
that those fixes are common to both). Unfortunately with the
multithreaded speed fix this has resulted in a moderately sized merge
conflict. I think I've fixed
