Comment 14 for bug 364305

Is there any progress on this? I'm also affected by it, and as Fritz wrote almost 6 months ago, it's a complete show-stopper. It's hard for me to use bzr at all when I can't merge. Is there a workaround? Thanks, Andrew.