I can check how HBase operates without merge commits... cherry-picking seems tedious, at least without the script - too easy to forget, and that would arguably be more harmful than a stray merge commit.
On Wed, Sep 17, 2014 at 10:47 AM, Brock Noland <br...@cloudera.com> wrote: > Hi, > > I am generally +1 on the proposal. I'd strongly want to disable merge > commits. They are far too easy to accidently push. If there is no option to > disable them, one option would be to do what we did in flume. > > Basically: > > 1) Trunk operates as normal. > 2) We always have the next release branch open > 3) Every commit is committed to trunk and immediately cherry-picked to the > release branch. We could use a script to automate this. > > Brock > -- CONFIDENTIALITY NOTICE NOTICE: This message is intended for the use of the individual or entity to which it is addressed and may contain information that is confidential, privileged and exempt from disclosure under applicable law. If the reader of this message is not the intended recipient, you are hereby notified that any printing, copying, dissemination, distribution, disclosure or forwarding of this communication is strictly prohibited. If you have received this communication in error, please contact the sender immediately and delete it from your system. Thank You.
