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 be identical right now anyway. Additonally, diverging
branches increase the risk of smaller cherry-picks to not apply
cleanly as well.
I don't see how this can be avoided besides saying to mostly NOT
merge/cherry-pick at all and only do so exceptionally. But if the
merged changes were useful in general for next_stable...
Mit freundlichen Grüßen
Thorsten Schöning
--
AM-SoFT IT-Service - Bitstore Hameln GmbH
Mitglied der Bitstore Gruppe - Ihr Full-Service-Dienstleister für IT und TK
E-Mail: thorsten.schoen...@am-soft.de
Web:http://www.AM-SoFT.de/
Tel: 05151- 9468- 0
Tel: 05151- 9468-55
Fax: 05151- 9468-88
Mobil: 0178-8 9468-04
AM-SoFT IT-Service - Bitstore Hameln GmbH, Brandenburger Str. 7c, 31789 Hameln
AG Hannover HRB 221853 - Geschäftsführer: Janine Galonska