Gerrit: working with multiple branches & propagating changes
===

I'm trying to identify the proper way of working with multiple branches on Gerrit that would match our workflow.

The way we work with branches right now is: we have master & feature branch. Master is the branch we want to polish and make it ready for release, while feature is obviously a field of intensive work. Now, in our particular case whenever somebody works on a bug fix, they:

  * create a change targeted for master branch
  * cherry pick it to the feature branch targeted change
  * once gerrit code review completes, submit both changes.

now the way i understand cherry-pick, it selects individual commit and merges it to the current change. if that is the case, i would expect to have no merge conflicts in the end, and indeed this workflow works perfectly with just GIT. Gerrit, however, most likely due to its nature (branches are not merged remotely the way these are locally and get a different sha tag) lists a tremendous number of conflicting files in the end.

Now, I resolved all these issues by applying merge strategy (ours on feature, theirs on master), but it does not feel right: if anything was not propagated, it just got discarded.

My question is: is there a *safe* workflow, similar to the above one, that would in the end produce a clean merge with gerrit?