bzr resolve

[Ben Finney]

Aaron Bentley <aaron at aaronbentley.com> writes:

> On 12-07-26 02:37 AM, Stephen J. Turnbull wrote:
> > Footnotes: [1]  (a) All uses of the verb "resolve" should be
> > changed to "mark as resolved."
>
> Since merely marking the conflict as resolved is only one of three
> possible actions resolve can take, this would be incorrect.

I think (and perhaps Stephen agrees) that a lot of the confusion stems
From this mixture of semantically conflicting actions under a single
command.

-- 
 \           “I am as agnostic about God as I am about fairies and the |
  `\           Flying Spaghetti Monster.” —Richard Dawkins, 2006-10-13 |
_o__)                                                                  |
Ben Finney
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 835 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/bazaar/attachments/20120727/7b2a2c67/attachment.pgp>