I had four changes in Gerrit, each depending on previous one (except first, of course). I\'ve abandoned second and third and reviewed first and fourth. Since first wasn\'t d
I used the answer from Magnus and did the interactive rebase and removed my previous commit but still had some merge conflicts. Then I manually updated the files to resolve the conflicts.
Finally added the modified files, then ran "git rebase --continue" to resolve the issue.