Click "Rebase" button in the Gerrit UI under your patch set.
- git review -d $PARENT_CHANGE_NUMBER
- git review -x $BROKEN_CHANGE_NUMBER
- fix the issues
- git add
- git cherry-pick --continue
- git review
- git reflog (to find the number)
- git reset --soft HEAD@{number}
- git commit -C HEAD@{number}