svn merge conflicts handle

svn merge conflicts handle

 

搜索冲突：

1，搜索目录 文件不存在类的冲突：  svn st | grep "C "

   发现冲突用： svn info manuals/parts/developer/resources   查看具体冲突信息

2，搜索文件text的冲突，就是含有   <<<<<  =====   >>>>> 之类的冲突；

  发现冲突用  vim 查看，解决冲突，

 

冲突解决后， 运行 svn resolved manuals/parts/developer/resources  消除冲突信息：

 

 

[leo@galaxy streamer-interfaces]$ svn merge -r 116075:118220  
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r116076 through r118220 into 'ParameterNames.h':
C    ParameterNames.h
Summary of conflicts:
Text conflicts: 1

[leo@galaxy streamer-interfaces]$ svn st
M      .
?       ParameterNames.h.merge-right.r118220
?       ParameterNames.h.merge-left.r116075
?       ParameterNames.h.working
CM      ParameterNames.h


[leo@galaxy streamer-interfaces]$ vi ParameterNames.h

=======
/**
* The ES Parameter , used by Open Internet container formats related elements, such as Mp4, Matroska, AVI and etc.
* Datatype:  A string.
* Set by:    Mp4/Matroska/Avi Elements.
*/
>>>>>>> .merge-right.r118220

<<<<<<< .working
/**
* The ES Parameter , used by Open Internet container formats related elements, such as Mp4, Matroska, AVI and etc.
* Datatype:  A string.
* Set by:    Mp4/Matroska/Avi Elements.
*/
=======

>>>>>>> .merge-right.r118220


after modify  ParameterNames.h based on your need.
you should run:
[leo@galaxy streamer-interfaces] svn resolved ParameterNames.h

 

 

其他类型的冲突：

1， external and ignores 类型的冲突： 在此目录下面会有一个 dir_conflicts.prej 文件， 需要检查此文件，看merge 3方的具体内容，决定如何修改

 vim   products/ip-box/boot_image/custom/dir_conflicts.prej

2，目录结构类的冲突, 比如，branch_C$merge A B,  此时A， B 有某个文件，也学变更，也许没有变更， 但branch_C下根本没有相应的文件，需要处理相关的文件；

!     C hal/3pp/motfrontend
!     C hal/3pp/broadcom_refsw/bcm_chip_setup.mk
!     C hal/3pp/broadcom_refsw/7405/patches/custom_file.patch
!     C hal/3pp/broadcom_refsw/7405/patches/brap_wmaStdacmod.patch
!     C hal/3pp/broadcom_refsw/7231/patches/custom_file.patch
!     C hal/3pp/broadcom_refsw/7420/patches/dcx35xx_bcm3255.patch
!     C hal/3pp/broadcom_refsw/7420/patches/custom_file.patch
!     C hal/3pp/broadcom_refsw/7125/patches/nexus_framebuffer.patch
!     C hal/3pp/broadcom_refsw/7125/patches/custom_file.patch

其实在branch_C 中这些冲突的文件都是不存在的；

 

3， 具体文件的冲突：