Gerrit push到master分支踩過的坑

Merge Conflict

參考https://www.cnblogs.com/dev2007/p/5830210.html

1.把幾個merge conflict的commit在Gerrit上abandon

2.git log找到未提交的編號*****，git reset --soft *****

3.git stash

4.git pull

5.git stash pop（如果有沖突，根據git status信息修復）

6.git add → commit→push

you are not allowed to upload merges

參考https://blog.csdn.net/qq_43279637/article/details/102565526