[Monotone-devel] Re: Multiple projects in one database -- branch confusion

[Steven E. Harris]

"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