Git workflow and Gerrit

Question

I am trying to implement a \'git-flow\' kind of workflow using Gerrit but I can\'t seem to figure out the last piece of the puzzle.

There are two preconditions to my pr

Answer 1

You should be able to merge the hotfix into your development branch. You don't need to merge master. We handle this with this workflow (a hotfix is considered another release and we rebase work on top of it):

https://plus.google.com/109096274754593704906/posts/R4qkeyRadLR