After doing git pull and getting merge patches, and then trying
to add my changes, prepare a patch, commit it and run git-review -f
master (I am
working with gerrit), I am getting this message:
git-review --dry-run -f master
You have more than one commit that you are about to submit.
The
I don't know anything about gerrit, but it looks like you did a git
pull when you should have done a 'git pull --rebase'. git pull
defaults to merging from the origin branch, that is your middle commit
0869, and that is almost always wrong.
rebase your branch onto master: git rebase origin/master
