标签:空格 提交 edit 选择 报价 option man space data
svn cp -m "名称" +空格+项目的svn地址 +空格+拷贝后的地址 svn cp -m "报价新分支" https://xxx@xxx/svn/Bihuwalking/iosApp/BHGlaucus https://xxx@xxx/svn/Bihuwalking/iosApp/BHGlaucus_1
项目编译执行后发现了一个问题,我之前主干上的代码并不是最新的,怎么办呢?
先到主干的工作目录下,将代码全部提交,
然后怎么更新到分支呢?难道要重新创建分支吗?不是,可以从主干合并到分支
切换到分支目录下:
cd BHGlaucuss_1
执行;
svn merge https://xxx@xxx/svn/Bihuwalking/iosApp/Glaucus
冲突合并提示:
Summary of conflicts: Text conflicts: 1 Conflict discovered in file ‘Glaucus/Managers/BHDataConfig.h‘. Select: (p) postpone, (df) show diff, (e) edit file, (m) merge, (mc) my side of conflict, (tc) their side of conflict, (s) show all options: tc Resolved conflicted state of ‘Glaucus/Managers/BHDataConfig.h‘ Summary of conflicts: Text conflicts: 0 remaining (and 1 already resolved)
选择了 tc
.
和从主干到分支一样简单
进入主干的工作目录 执行命令
svn merge --reintegrate https://xxx@xxx/svn/Bihuwalking/iosApp/BHGlaucus_1
标签:空格 提交 edit 选择 报价 option man space data
原文地址:http://www.cnblogs.com/xuaninitial/p/7230729.html