svn冲突解决 https://blog.csdn.net/nangongyanya/article/details/22054535 egit冲突解决 https://blog.csdn.net/tototuzuoquan/article/details/47138765