> Bob Archer wrote: > > > > Hi All, > > > > > > > > I am doing our weekly merge from our release version project path > to > > our new version development path. I am a bit confused at what the > > conflict markers are showing me... here is the snippet of the > code > > with the conflict markers: > > > > > > > > <<<<<<< .working > > > > If loBudgetCheck.OBMsg Is Nothing > Then > > > > Exit For > > > > End If > > > > ======= > > > > If Not loBudgetCheck.OBMsg Is > Nothing Then > > > > >>>>>>> .merge-right.r40712 > > > > > > > > What does this mean? I expected to see the change made in the > target > > as working and the change made in the source as "right". > > > > > > > > BOb > > > Working is what was on your hardrive (in your working copy) before > you > updated. > Merge right is what comes from the server, namely at revision 40712 > You have to decide what version of the two you want to keep. >
So basically what is between the <<<<<<< and the ======== is the diff between the base common rev and the working copy. And what is between the ========= and the >>>>>>>>>> is the diff between the base common rev and the change in r40712? Is that correct? And if so... how does svn determine the common base rev? BOb
