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
显示如下：
cat merge.txt
"totally different content to merge later"
I am thinking.
"totally different content to merge later"
a few suggestion comes here.
<<<<<<< HEAD
i have an idea
I don't think so.
c0fa4e42eebe46056d2e2e82b1ca12a4d07c167f
使用vs code除去问题
最后
git add merge.txt
git commit -m "hello"
git push