eclipse中svn从分支合并到主干及冲突解决

https://blog.csdn.net/shengqianfeng/article/details/79203156