Hi Daan On 02/14/2018 05:26 PM, Daan Hoogland wrote: > Rene, > > The issue is certainly not due the git workflow but to upgrade schemes we > have. > > The result of this workflow for us is that it is easier to find to which > branches a particular commit is added as by merging forward the commit id > of the actual fix doesn't change. so instead of looking in each branch for > a bit of code you can look for a commit id on a branches log.
Ah I see. However, the same can be achieved by adding -x to cherry-picks (to add the origin commit id), without the downside that a fix can "only" go into one stable branch. Keep in mind, we certainly do have more than one stable branch at a time (4.11-lts, 4.12). A fix should be applicable to any stable branch. Or how would this work with the current workflow? René
