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
