SVN:分支合并到主干

合并日志：

 

--- Merging r173674 through r175986 into '.':
   C src/test/java/com/test/rigel/sandbox/organization/service/HeartBeatServiceTest.java
U    src/test/java/com/test/rigel/sandbox/core/auth/OrgAuthServiceTest.java
U    src/main/java/com/test/rigel/sandbox/core/auth/service/OrgAuthService.java
U    src/main/java/com/test/rigel/sandbox/core/auth/service/impl/OrgAuthServiceImpl.java
U    src/main/java/com/test/rigel/sandbox/core/auth/vo/OrganizationVo.java
Conflict discovered in 'src/main/java/com/test/rigel/sandbox/core/auth/filter/UserAuthFilter.java'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
C    src/main/java/com/test/rigel/sandbox/core/auth/filter/UserAuthFilter.java
U    src/main/java/com/test/rigel/sandbox/core/conf/SystemConf.java
U    src/main/java/com/test/rigel/sandbox/core/web/action/GenericAction.java
   C src/main/java/com/test/rigel/sandbox/portal/web/action/ErrorAction.java
U    src/main/java/com/test/rigel/sandbox/portal/web/action/JumpAction.java
Conflict discovered in 'src/main/java/com/test/rigel/sandbox/portal/web/action/IndexAction.java'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
C    src/main/java/com/test/rigel/sandbox/portal/web/action/IndexAction.java
   C src/main/java/com/test/rigel/sandbox/portal/service/JumpService.java
   C src/main/java/com/test/rigel/sandbox/portal/service/impl/JumpServiceImpl.java
Conflict discovered in 'src/main/java/com/test/rigel/sandbox/portal/cons/ErrorCode.java'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: p
C    src/main/java/com/test/rigel/sandbox/portal/cons/ErrorCode.java
   C src/main/java/com/test/rigel/sandbox/task/web/action/LoginCountTaskAction.java
U    src/main/java/com/test/rigel/sandbox/organization/web/action/HeartBeatAction.java
U    src/main/java/com/test/rigel/sandbox/organization/web/model/OrganizationModel.java
U    src/main/java/com/test/rigel/sandbox/organization/bo/Organization.java
U    src/main/java/com/test/rigel/sandbox/organization/service/impl/HeartBeatServiceImpl.java
U    src/main/resources/conf/applicationContext-sysConfig.xml
U    src/main/resources/com/test/rigel/sandbox/organization/bo/conf/OrganizationMapper.xml
U    WebContent/src/orgsMgt/orgConfig.js
U    WebContent/entry/orgsMgt/orgs.vm
Summary of conflicts:
  Text conflicts: 3
  Tree conflicts: 5

 

步骤：

1.先把主干代码下载到本地
    svn co https://svn.test.com/app/ecom/shifen/sf-crm/trunk/test

2.进入主干目录

  cd test

3.svn merge 分支目录    
    svn merge https://svn.test.com/app/ecom/shifen/sf-crm/branches/test/test_1-1-0_BRANCH

4.遇到冲突， 请见合并日志，选择"p"，记下出冲突的文件，人工编辑
 4.1 比如Index.action出冲突了，vi Index.action
 4.2 vi完成以后，删除冲突的文件 rm -f Index.action.*
 4.3 解决冲突 svn resolve --accept working IndexAction.java

4.5 针对树的冲突，则直接(看情况) svn resolve --accept working ......

5.解决完所有冲突后，再提交svn ci -m "*****"

6.svn diff 来查看是否还有冲突

7.到websvn.***.com去对比代码

8.打tag
    svn cp . https://svn.test.com/app/ecom/shifen/sf-crm/tags/test/test_1-1-0-MERGE_PD_BL/ -m "merge branch_1-1-0 to Main"