Git Tools - Stashing
While there's a lot of discussion, there's no real howto to fix things up using repo using three simple commands.
Gerrit won't merge when someone is too slow to merge your changes, you've ameded your merge...A change came in before your change was merged...it happens...a lot.
repo start [branchname]
# You've made your changes and sent them to Gerrit...
Gerrit merge fails. Here's HowTo fix it.
# Get on your repo start [branchname]
git checkout [branchname]
# Find the name of the remotebranch you are merging to with Gerrit.
# Your local changes need to be stashed for now.
# Fix your branch so you can merge with Gerrit.
# After upload, you should see a new patch to your merge in Gerrit.
At this point, you should be able to review and merge in Gerrit, hurry up :)