SVN在分支上同步(合并)主干代码
![](/images/avatar.png)
说明:多项目都是在一个主项目上分支出来项目作为其他版本修改,有部分bug已经在主干项目修改好了需要同步到分支项目上。
同步操作
1,项目右键选择Merge
![This is an title image](/svn/SVN%E5%9C%A8%E5%88%86%E6%94%AF%E4%B8%8A%E5%90%8C%E6%AD%A5-%E5%90%88%E5%B9%B6-%E4%B8%BB%E5%B9%B2%E4%BB%A3%E7%A0%81/asset1.jpg)
2,选择第一个
![This is an title image](/svn/SVN%E5%9C%A8%E5%88%86%E6%94%AF%E4%B8%8A%E5%90%8C%E6%AD%A5-%E5%90%88%E5%B9%B6-%E4%B8%BB%E5%B9%B2%E4%BB%A3%E7%A0%81/asset2.jpg)
3,选择版本,注意主干地址和分支地址
![This is an title image](/svn/SVN%E5%9C%A8%E5%88%86%E6%94%AF%E4%B8%8A%E5%90%8C%E6%AD%A5-%E5%90%88%E5%B9%B6-%E4%B8%BB%E5%B9%B2%E4%BB%A3%E7%A0%81/asset3.jpg)
4,选择合并的版本号可多选
![This is an title image](/svn/SVN%E5%9C%A8%E5%88%86%E6%94%AF%E4%B8%8A%E5%90%8C%E6%AD%A5-%E5%90%88%E5%B9%B6-%E4%B8%BB%E5%B9%B2%E4%BB%A3%E7%A0%81/asset4.jpg)
5,Test merge 测试合并能否成功,最后点击merge
![This is an title image](/svn/SVN%E5%9C%A8%E5%88%86%E6%94%AF%E4%B8%8A%E5%90%8C%E6%AD%A5-%E5%90%88%E5%B9%B6-%E4%B8%BB%E5%B9%B2%E4%BB%A3%E7%A0%81/asset5.jpg)
同步中可能出现的冲突处理
合并中会出现冲突,解决方式
https://segmentfault.com/a/1190000014294501
合并有冲突后,删除了本地代码 SVN中合并过的代码不能重新合并的问题
https://blog.csdn.net/danielyhsu/article/details/89345162
SVN合并代码报错:Merge tracking not allowed with missing subtrees; try restoring these items
https://blog.csdn.net/ASN_forever/article/details/102960365
评论