gerrit

Posted by shensunbo on August 12, 2025

clone

git clone –depth 1 –branch master …

push

  1. normal push
    • git push origin HEAD:refs/for/master
  2. push to previous patchset
    • git commit –amend
    • git push origin HEAD:refs/for/master

conflict

  1. local rebase
    • git pull –rebase origin master
    • fix conflict
    • git rebase –continue

reset

  1. reset to server
    • git reset –hard origin/master

check if conflict exist

1
2
* git fetch origin master
* git diff origin/master...HEAD