Thanks for the suggestions. I wasn't aware of interactive git rebase. It might makes it simpler to carry out (a) if there are no conflicts.
Zoltan On Tue, Nov 6, 2018 at 4:06 PM Jim Apple <jbap...@cloudera.com> wrote: > > > > I just have a technical question about it. Should we > > a) select an early branching point then do a lot of cherry picks for the > > commits we want in and leave out the risky ones > > b) select a recent branching point then revert the risky commits on the > > release branch > > > > I think (a) is easier for someone who is doing some git work on the branch, > but our branches tend to be used once for releases and then rarely touched > again, so it's not a disaster to do (b). >
