[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Monotone-devel] How to join identical branches?

From: Julio M. Merino Vidal
Subject: Re: [Monotone-devel] How to join identical branches?
Date: Mon, 11 Feb 2008 21:18:12 +0100

On Feb 11, 2008, at 7:45 PM, Nuno Lucas wrote:

I have 2 branches with a common ancestor, but during some time they
were apart and some renames, drops and adds were made. Now the 2
branches are identical because the contents was generalized to
accommodate both cases.

Because of the renames, add's and drops, propagate fails with "rename
target conflict".
If both branches are identical how can I resolve the "non-content conflicts"?

Not really answering your question but... if the two are identical, why do you want to merge them? You can just suspend one of the two and continue working on the other.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]