What are 3-way conflicts?

Eric B. <[email protected]> Tue, 13 Oct 2009 15:24:29 -0400

Newsgroups	gmane.comp.version-control.cvs.windows-nt.user
Message-ID	<[email protected]>

Hi,


I've been trying to find some information that can help me understand exactly what 3-way conflicts really are.  WinCVS has an option to produce 3-way conflict files, which I believe translates to the -3 switch in CVSNT.

 

According the the cvsnt docs, -3 switch "Provide 3-way conflicts.".  However, I have no idea what that means.

 

I've done a google search on 3way conflicts, but cannot seem to find anything relevant anywhere.

 

Can anyone point me to some useful reference information and/or exmaples as to way exactly 3way conflict files are?

 

Thanks!

 

Eric

 
 		 	   		  
_________________________________________________________________
New: Messenger sign-in on the MSN homepage
http://go.microsoft.com/?linkid=9677403
_______________________________________________
cvsnt mailing list
[email protected]
http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt

Upgrade to CVS Suite for more features and support: http://march-hare.com/cvsnt/