angular.js - I have not modified a file, why is there a conflict when pulling? ? /

Question

(www.sf.gg) is China's leading developer technology community. We hope to provide a pure, high-quality technical exchange platform for programming enthusiasts, learn, communicate and grow with developers, and create an era for developers!

天蓬老师 · Answer

Maybe it was modified by someone else

过去多啦不再A梦 · Answer

Are the line breaks consistent?