Cannot merge in Gerrit

Question

Whenever I sent a review to Gerrit and if the review is pending for some time, I am getting cannot merge message in Gerrit.

I understood its coming because

Answer 1

You do NOT need to abandon the current change on Gerrit to solve the "cannot merge" issue. All you need to do is:

1. Update your local repository (git fetch)
2. Run a manual rebase (git rebase)
3. Resolve the conflicts (git mergetool, git rebase --continue)
4. Commit (amend) the result (git commit --amend)
5. Push a new patchset to Gerrit (git push)