svn中文件冲突

1.参考

http://blog.csdn.net/u014236541/article/details/54408905

http://blog.csdn.net/qishuang1123/article/details/58652844

http://blog.csdn.net/androiddevelop/article/details/18743285

2