Comment 12 for bug 113809

I'd also fancy such a solution described by Jelmer.
Seems to be an intelligent software if it suggest how to solve such update problems.

I often create a copy of the folder before doing bzr update because I fear this merge nightmare.