[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-devel] Re: Multiple projects in one database -- branch confusi
From: |
Steven E. Harris |
Subject: |
[Monotone-devel] Re: Multiple projects in one database -- branch confusion |
Date: |
Wed, 06 Dec 2006 15:25:02 -0800 |
User-agent: |
Gnus/5.110006 (No Gnus v0.6) XEmacs/21.4.13 (cygwin32) |
"Justin Patrin" <address@hidden> writes:
> Monotone won't see any relationship until you merge one into the
> other. Then it will get a mege conflict when you try to merge them
> as they're named the same but do no share any ancestry. This is if
> you simply merge them as-is, though.
[...]
Thank you. That explanation was very helpful.
> No, it would cause a merge conflict since they do not have shared
> ancestry.
How does one tell monotone which merge option to choose? I see that
the options are "keep the live file" or "kill the live file and
subsequent files of that same name", but what's the user interface to
select?
--
Steven E. Harris
Re: [Monotone-devel] Multiple projects in one database -- branch confusion, Brian May, 2006/12/06