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