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

The best solution is definitely to merge either master or the hotfix branch into your development branch. I'm not sure what your 'no merge commits' precondition is trying to solve, but it will probably create more hassle than it is worth.

On the other hand, if you do cherry pick, git will usually detect the duplicate commit during the merge and automerge it without any problems. But when there are problems they won't be fun. Also it isn't as clear which fixes have been cherry picked and which haven't, where as with a merge it is very clear.