需要忽略.txt
<<<<<<< HEAD
停止跟踪.txt
=======
>>>>>>> no message