[Monotone-devel] How to join identical branches?

[Nuno Lucas]

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"?


Best regards,
~Nuno Lucas