clone
git clone –depth 1 –branch master …
push
- normal push
- git push origin HEAD:refs/for/master
- push to previous patchset
- git commit –amend
- git push origin HEAD:refs/for/master
conflict
- local rebase
- git pull –rebase origin master
- fix conflict
- git rebase –continue
reset
- reset to server
- git reset –hard origin/master
check if conflict exist
1
2
* git fetch origin master
* git diff origin/master...HEAD