GIT上CSS文件中的持续合并冲突

I don't know if that's a common problem. Most of the times that we pull a CSS file from our development repo, GIT conflicts with the current file, entirely merging the two files by putting the ">>>" and "<<<" markers at the very top and bottom, and a "===" marker separating them.I don't know if that's a common problem. Most o