Conflicts in removed files

[Stephen J. Turnbull]

Algis Kabaila writes:

 > > The issue is more subtle.  Stefan sees the conflict, notes
 > > that he wants to solve it in a particular way.  (It may even be the
 > > case that he knows in advance how he's going to resolve it.

 > Well, it all is too much for a simple mortal to grasp... You,
 > evidently, know what Stefan wants.

No, I just took him at his word.  He said he knows what he wants.
That doesn't mean that I know what he wants.

The problem here is that to the extent that we know what he wants,
too, bzr should just do it.  But when we don't, we should ask.  And
the very best UI will help him figure it out when he's unsure (but
that is very hard to achieve).