Eric, > 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? >
Search for '3 way merge' instead: http://en.wikipedia.org/wiki/Merge_(revision_control) Regards, Arthur _______________________________________________ cvsnt mailing list cvsnt@cvsnt.org http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt Upgrade to CVS Suite for more features and support: http://march-hare.com/cvsnt/
