| |
Merging isn't perfect | page 3 of 25 |
However, if two or more developers have made changes to the same region of
the same file, then things get a bit more complicated. If that happens,
then cvs will tell you that there's been a conflict. No work will be lost, but
a bit of manual intervention will be required, since cvs now requires your
input on how to merge the conflicting changes.
|