Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone)

[Markus Wanner]

On 06/19/2012 01:56 PM, Stephen Leake wrote:
> Ok, that makes sense. I did wonder whether to include something like
> "history will be lost; see user guide" in the conflict resolution
> message.

That already covers the major point, I think. Maybe a bit more specific
(monotone certainly shouldn't ever lose the entire history):

"History for file ${FOO} will be lost; see the users manual, section ${BAR}"

(Nit-pick: it's usually called a manual, not a guide, is it?)

Regards

Markus Wanner