[cvsnt] Why is this a conflict?

[Anne Bonham]

Can anyone point me to more info on what CVS considers a conflicting merge?

I had developer x add 3 lines to the end of a file

Then developer y added 2 different lines to that file

CVS considered this to be a conflicting merge. I'm surprised it couldn't
auto merge something like this. Why would this be?

Anne

-----------------------------------------
Anne Bonham | Release Manager
abonham at gnx.com | abonham (yim)
GlobalNetXchange, LLC |
San Francisco | CA | 94104

-----------------------------------------




-----------------------------------------
Anne Bonham | Release Manager
+1 415.283.3745 (o) | +1 415.218.7805 (c)
abonham at gnx.com | abonham (yim)
GlobalNetXchange, LLC | 333 Bush Street 18th Floor
San Francisco | CA | 94104

-----------------------------------------