GitHub Pull request 同步解决代码冲突

参考：

https://zhuanlan.zhihu.com/p/337949346

 

git remote -v
git remote add upstream git@gitee.com:src-anolis-os/bpftrace.git
git remote -v
git fetch upstream
git branch -a
git merge upstream/a8

git add .

git commit

git push -f origin a8