--- tags: Git,Gerrit,Code Review --- # Gerrit Code Review Merge Conflict 1. Clone the Gerrit repository ```shell git clone https://USER@GERRIT-SERVER/a/REPO-FULL-PATHNAME ``` 2. Go to the change page on Gerrit and copy the checkout patch command ```shell git fetch https://USER@GERRIT-SERVER/a/REPO-FULL-PATHNAME refs/changes/XX/YYYYY/Z && git checkout FETCH_HEAD ``` 3. Rebase the change ```shell git rebase origin/BRANCH ``` 4. Solve the conflicts 5. Continue the rebase ```shell= git rebase --continue ``` 6. Send the new patchset to Gerrit ```shell git push origin HEAD:refs/for/BRANCH ```