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.
_______________________________________________
Monotone-devel mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/monotone-devel
