Resolve merge conflict on Gerrit

In this article, we have explained the steps to resolve merge conflict on Gerrit with the detailed step by step commands. This can be solved in the console using rebase command and manually, fixing the conflicts in code.

Pre-requisite:

Open a pull request on GerritReview a Merge Request on GerritFix merge conflict on Gerrit

You can find that there is a merge request when you will try to rebase your pull request. You can rebase using the "rebase" button on the pull request page.

"Rebase" mean...