On Wed, 28 Feb 2007 23:59:32 +0200, Boris <[EMAIL PROTECTED]> 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 _______________________________________________ Monotone-devel mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/monotone-devel
