[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Binary File Conflicts

From: Jake Colman
Subject: Binary File Conflicts
Date: Fri, 08 Dec 2006 08:25:21 -0500
User-agent: Gnus/5.1007 (Gnus v5.10.7) XEmacs/21.4.17 (Jumbo Shrimp, usg-unix-v)

How does CVS handle conflicts on binary files?  I know that CVS will
recognize the -kb flag and realize that it cannot do a merge.  But what
happens if the same file is modified on two branches?  What does/can it do?

Jake Colman
Sr. Applications Developer
Principia Partners LLC
Harborside Financial Center
1001 Plaza Two
Jersey City, NJ 07311
+1 (201) 209-2467

reply via email to

[Prev in Thread] Current Thread [Next in Thread]