[cvsnt] CVS non-conflict and conflict merge

[Gabriel Genellina]

At 13/11/2003 16:14, you wrote:

>I am a little confused about the merge in CVS. This is my understanding
>about CVS non-conflict and conflict merge.  Please fix me if I am wrong.
>
>Non-conflict merge:
>         Both user1 and user2 check out file version 1.2. User1 modify line
>5, user2 modify line 6.
>         As long as the two users modify different lines, there will be no
>conflicts. Users can check in   changes in any order. After both users have
>checked in, the project seamlessly has both changes     incorporated.
>Whoever last check in will get both changes.

Lines 5 and 6 are too close so a conflict is reported too. If the changes 
were a bit more apart, lines 5 and 10 by example, merging is automatic.

>Conflict merge:
>         Both user1 and user2 check out file version 1.2. They both modify
>line 10.
>         Whoever last check in will get the conflict Editor, he has to
>manually modify the conflicted line.Save        it and check in. All
>non-conflicts still merge seamlessly.

Yes.


Gabriel Genellina
Softlab SRL