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

[Derek Scherger]

Stephen Leake wrote:
> Another solution would be to provide a new option --merge-drop-right for
> merge. Then the flow would be:
>
> merge
>     -- fails with one or more non-content conflicts
>
> rename as appropriate to resolve some conflicts
>
> merge --merge-drop-right
>     -- resolves remaining non-content conflicts as described above, succeeds
>
> That is a simpler user interface, since it doesn't involve prompting.
> However, it will be slower, since it involves two passes.

Probably the best user interface for all of this is workspace merge. 
Assuming it can record all conflicting files somewhere in the workspace, 
let the user look at the conflicting texts on both sides of the merge, 
use their favorite tool to merge their contents, etc.

> There is currently a section "Advanced Uses | Workspace Collisions"; we
> could add "Advanced Uses | Non-content Conflicts". I can do that, once
> I get confirmation that I understand the issues correctly.

I've been meaning to add such a section on Non Content Conflicts since I 
made the changes to improve the associated messages. Ideally this would 
be worded in terms of the new messages. I'd still like to get this done, 
but I don't know when I'll get to it so I won't feel bad if you beat me 
to it. ;)

Cheers,
Derek