Git 冲突提示

<<<<<<< HEAD
new new new new code
=======
old old old code
>>>>>>> 一堆这个commit content