[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] usage question
From: |
Brian May |
Subject: |
Re: [Monotone-devel] usage question |
Date: |
Tue, 13 Feb 2007 12:57:06 +1100 |
User-agent: |
Gnus/5.110006 (No Gnus v0.6) XEmacs/21.4.19 (linux) |
>>>>> "Arthur" == Arthur A Gleckler <address@hidden> writes:
Arthur> I have a question that is a user's question, not a Monotone
Arthur> developer's question. I apologize in advance if this list isn't the
Arthur> appropriate place. Please let me know if it isn't.
I believe this list is appropriate - somebody will correct me if I am
wrong though...
Arthur> What's the right way to proceed here? Is there a way to have
Monotone
Arthur> prompt me to merge just the files that don't match, running a
manual
Arthur> merge tool as necessary? Is there any problem starting with two
Arthur> versions of a file that don't, in fact, have a common ancestor in
Arthur> Monotone?
At the moment the merge user interface has significant limitations.
Generally, you could solve issues by moving the files into a different
directory, or otherwise renaming them, so conflicts don't occur, and
then fixing up the mess manually.
However, this won't work if the root directory conflicts, /, as it
isn't possible to rename it.
For solutions if the root directory conflicts, see the mailing list
archives, this topic has been discussed before.
Arthur> I'm not on <monotone-devel> (yet), so please include me in To or CC
on
Arthur> any replies.
Done.
--
Brian May <address@hidden>