svn - Are the Subversion vertical bar conflict markers the same as the ones in git-merge? -
i've switched subversion 1.9, , noticed when encounters merge conflict, in addition conflict markers i'm used (<<<<<<<
, =======
, >>>>>>>
) has been outputting vertical bars, these: |||||||
for example:
<<<<<<< .working bool a; ||||||| .merge-left.r22239 bool b; ======= bool c; >>>>>>> .merge-right.r22246
is same conflict markers used git-merge when diff3 set?
if not, how should reading this?
it seems me it's saying:
- in base (left) there line "bool b".
- the working copy replaced "bool a".
- the remote merge source (right) replaced "bool c".
is correct?
relevant related questions:
how can see “three way diff” git merge conflict?
configuring subversion client use 3-way conflict markers
Comments
Post a Comment