旧版本 http://svn.alibaba-inc.com/repos/ali_express/mobile/modules/mobile/adaptor/branches/20140421_358481_2
新版本 http://svn.alibaba-inc.com/repos/ali_express/mobile/modules/mobile/adaptor/branches/20140428_358481_3
一、查看旧版本改动
svn log --stop-on-copy http://svn.alibaba-inc.com/repos/ali_express/mobile/modules/mobile/adaptor/branches/20140421_358481_2
得到708449
二、切换分支到新版本
svn sw http://svn.alibaba-inc.com/repos/ali_express/mobile/modules/mobile/adaptor/branches/20140428_358481_3
三、合并
尝试合并：svn merge -r709409:head http://svn.alibaba-inc.com/repos/ali_express/mobile/modules/mobile/adaptor/branches/20140422_360285_1 --dry-run
svn merge -r708449:head http://svn.alibaba-inc.com/repos/ali_express/mobile/modules/mobile/adaptor/branches/20140428_358481_2
(往历史版本合并！)
四、如果没有冲突，直接提交
svn ci -m "superdeals test"
解决树冲突：
1.删除原项目
rm -rf
2.拉新的分支
svn co http://svn.alibaba-inc.com/repos/ali_express/seller/apps/web/intl-wsbops/branches/20140512_358481_5 intl-wsbops
3.往旧版本合
svn merge -r708936:head http://svn.alibaba-inc.com/repos/ali_express/seller/apps/web/intl-wsbops/branches/20140422_358481_superdeals_4
4.提交
svn ci -m "superdeals test"
解决冲突
svn resolve --accept working web/wsstore/.settings
