Error during merge: No final name for trans_id 'new-70'

[Andrew Bennetts]

John Arbash Meinel wrote:
> I thought someone wrote a plugin to say something like "DELETE
> supersedes modifications".
> 
> I forget exactly how to write it, but you are looking to inherit from
> bzrlib.merge.PerFileMerger and define something like:
> 
> class DeleteWinsMerger(PerFileMerger):
[…]

I just want to echo what John said.  This should be pretty easy — and it
will work at merge time, no special 2nd resolve step needed to clean up
a mess.

-Andrew.