|
| From: | Boris |
| Subject: | [Monotone-devel] Re: rename target conflict - what to do now? |
| Date: | Thu, 01 Mar 2007 00:51:38 +0200 |
| User-agent: | Opera Mail/9.10 (Win32) |
On Wed, 28 Feb 2007 23:59:32 +0200, Boris <address@hidden> wrote:
[...]I'm told to resolve non-content conflicts. But what conflicts is monotone talking about? And what I'm supposed to do actually? What does 1544 and the other numbers mean?
Problem solved (after searching in the archive for a solution). I had to rename some directories and could then merge.
Boris
| [Prev in Thread] | Current Thread | [Next in Thread] |