Other's Changes (cont.)


If the same line is modified in two different ways "conflict" occurs.

<<<<<<< .mine
  Your changes.
=======
  New changes that came from repo.
>>>>>>> .r(latest repo revision)



Keep the required change remove markers and the other change.

$ svn resolved file
Slide 14