[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-devel] Re: merge failure
From: |
Peter Simons |
Subject: |
[Monotone-devel] Re: merge failure |
Date: |
14 Jan 2004 12:31:37 +0100 |
[Sorry for the long delay in answering this!]
graydon hoare writes:
>> | monotone: conflict: file sets 'left dels' and 'right move sources'
>> intersect
> could you describe the changes you made to get here?
Unfortunately not. I synchronized branches hence and forth
quite wildly. :-) I'll keep an eye open for this and let you
know if I hit the error message again.
Peter
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-devel] Re: merge failure,
Peter Simons <=