Comment 2 for bug 232512

I think the best way to address the issue while still taking Aaron's concern into account is to propose:
1 - force THIS (for all conflicted regions)
2 - force OTHER (for all conflicted regions)
3 - manually solve each conflicted region
4 - force THIS (overriding all cleanly merged modifications)
5 - force OTHER (overriding all cleanly merged modifications)

when interactively resolving the conflicts (which I'm working on lp:~vila/bzr/conflict-manager).

Note that Aaron's command above is (4) in the list, while I suppose jml want (1)

I didn't intend to address that as a first priority though.

And don't rush on that branch, it's vaporware so far.