Conflict while using "bzr pull"

[Jamie Wilkinson]

This one time, at band camp, James Blackwell wrote:
>There is still a need for --full for a different reason. Many sorts of
>problems can (and likely will) rear up from time to time as people bump
>into undefined behaviours. We know a priori that when users start bumping
>into undefined behaviour that the right solution is to expose the problem
>so that the proper behaviour can be defined. 

I agree with your hypothesis, but adding to bzr a command to work around
future bugs says to me "the offical way forward is to not report this bug,
just run this command and it'll be like it never happened."  I posit that
making it easier for people to not report bugs will increase entropy and
accelerate the heat death of the universe :)

More seriously, I think adding support in bzr to workaround potential
bugs with merge or pull a lot of effort for little gain.