|
From: | Derek Robert Price |
Subject: | Re: import inconsistency |
Date: | Fri, 13 Jun 2003 10:42:10 -0400 |
User-agent: | Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.0.2) Gecko/20030208 Netscape/7.02 |
Paul Edwards wrote:
It's not the end of the world though, assuming that conflict on added files gets committed, there will be no KNOWN integrity problems involving source code lost, which is a damn good start!!! Oh, and the fact that there are now separate release and development branches also makes a hell of a difference too. At the end of the day, it's pretty good. :-)
Want to explain again why an added file should produce a conflict _after_ a merge? As far as I could tell in the scenario you provided before, everything went exactly as it should. Perhaps you could provide more detail about your intentions, the process, and why you don't like what happened?
Derek -- *8^) Email: derek@ximbiot.com Get CVS support at <http://ximbiot.com>! -- ******* **** **** ******* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *** * * * * * * * * * * * * * * * * * * * * * * * * ***** * ** * ** * * * * ******* * *******
[Prev in Thread] | Current Thread | [Next in Thread] |