[手游项目2]-26-linux svn冲突 遇到Conflict discovered in ‘*****’问题

https://blog.csdn.net/little_stupid_child/article/details/53612018