https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts
https://css-tricks.com/deal-merge-conflicts-git/
我的一些操作
本地：nano merge.txt
在gitee上做了些操作
接着
git add merge.txt
git commit -m "hello"
git pull
git diff -b
使用vs code除去问题
最后
git add merge.txt
git commit -m "hello"
git push
原文：https://www.cnblogs.com/uceec00/p/13432689.html