Hi Joost,
Gerrit has a bit of a learning curve. Generally speaking there is no merges in gerrit workflow - instead you cherry-pick changes between the branch.
The basic steps here are:
1) Checkout master branch
2) Cherry-pick your change from your working branch
3) Submit to gerrit.
I generally use git command line, so I am not as familiar with the eGit (Eclipse Git Integration) tools. But at the command line I would do this:
git fetch origin
git checkout origin/master -b bug535565_try2
git cherry-pick bug535565
git push origin HEAD:refs/for/master
Later when you are doing updates based on review feedback, you will amend and repush your commit:
# make edits
git add changed files
git commit --amend --signoff
git push origin HEAD:refs/for/master
HTH,
Jonah
~~~
