Home > Back-end >  Related problems: GIT conflict resolution Gerrit Review when conflict how to solve
Related problems: GIT conflict resolution Gerrit Review when conflict how to solve

Time:12-05

After local modify the code:
Git add.
Git commit -m 'coding'
Git push origin HEAD: refs/for/master
After the git push generates a Gerrit review link,
Question: if there is conflict of code in the review stage, how should I go to merge conflicts, and to push Gerrit before or after review the link? Still say can only generate another new review link

  • Related