|
| From: | graydon hoare |
| Subject: | [Monotone-devel] Re: merge failure |
| Date: | Sun, 28 Dec 2003 14:41:02 -0500 |
| User-agent: | Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.5) Gecko/20031115 Thunderbird/0.3 |
Peter Simons wrote:
| monotone: conflict: file sets 'left dels' and 'right move sources' intersect
it's complaining because it thinks you deleted (or moved) a file on one edge of a 3-way merge, which you moved on the other, and it doesn't know how to reconcile this or (yet) know how to ask the user for help. eventually we'll decide on a UI for resolving tree-layout conflicts -- probably this "merge into dir" thing -- but right now it just gets huffy and quits.
could you describe the changes you made to get here? -graydon
| [Prev in Thread] | Current Thread | [Next in Thread] |