Comment 11 for bug 530584

So a possible solution might be to have a 'merge-ignore-deletes' directive in a bzr-builder recipe? (I'm not proposing that exact syntax, just exploring ideas.) It could perform the merge and either via a merge_file_content hook or a post-merge introspection of the conflicts discard the conflicts due to a delete in the branch being merged from. What do you think James?