On Mon, 14 Oct 2019 at 03:39, Campbell Barton <[email protected]> wrote: > - How to handle fixes that are first made to master, > and later on we find should be applies to the stable branch > (merge? cherry pick?).
To make merging process as clean as possible I would say revert in master, apply to stable, merge down to master. > - How to handle fixes that backfire > (eg, a fix we make in the stable branch, then cause issues, > then we want to remove from the stable branch but keep in master). What kind of backfire are you talking about? > - How strict are we on merging immediately after committing > to the > stable branch? > So far there has been some accumulation of multiple commits > to the stable branch which then get merged. > > Is it discouraged to push multiple fix commits, > then a merge afterwards? Since the assumption is a commit per fix it'd be ideal to merge down to master once the fix is in stable. /Nathan _______________________________________________ Bf-committers mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-committers
