[cvsnt] Why is this a conflict?

Anne Bonham abonham at gnx.com
Tue Jan 13 20:09:55 GMT 2004


No

-----Original Message-----
From: Colin Bendell [mailto:cbendell at point2.com]
Sent: Tuesday, January 13, 2004 12:04 PM
To: abonham at gnxchange.com; cvsnt at cvsnt.org
Subject: RE: [cvsnt] Why is this a conflict?


Do you have :id: or :log: keywords in this file?

/colin

-----Original Message-----
From: cvsnt-bounces at cvsnt.org [mailto:cvsnt-bounces at cvsnt.org] On Behalf
Of Anne Bonham
Sent: Tuesday, January 13, 2004 2:04 PM
To: cvsnt at cvsnt.org
Subject: [cvsnt] Why is this a conflict?

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

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

_______________________________________________
cvsnt mailing list
cvsnt at cvsnt.org
http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt


More information about the cvsnt mailing list