bzr resolve

[Stephen J. Turnbull]

Aaron Bentley writes:

 > On 12-07-26 02:37 AM, Stephen J. Turnbull wrote:

 > > That "automatically" strongly suggests some intelligence on the
 > > part of resolve.
 > 
 > Ben and Bosco are talking about the "resolve FILE" form, not the
 > no-argument form, but the "automatically" describes the no-argument
 > form.

OK.

Nevertheless, I think the rationale for "bzr resolve FILE" not
checking by default (at least FILE itself) is pretty weak.  Maybe it's
just me, but on several occasions I've broken builds (locally only,
fortunately for keeping face) because I left a marker in a file.