Comment 4 for bug 355964

"... a single conflict has caused several different types of changes."

And each of these must be resolved separately. I would have wasted far less time here if Bazaar had eaten my working directory alive rather than move pieces of it around unpredictably.