[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict
From: |
Markus Wanner |
Subject: |
Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone) |
Date: |
Wed, 20 Jun 2012 20:07:47 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:10.0.4) Gecko/20120510 Icedove/10.0.4 |
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
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), (continued)
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Stephen Leake, 2012/06/05
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Markus Wanner, 2012/06/06
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Stephen Leake, 2012/06/07
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Markus Wanner, 2012/06/08
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Stephen Leake, 2012/06/09
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Stephen Leake, 2012/06/09
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Markus Wanner, 2012/06/11
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Stephen Leake, 2012/06/13
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Markus Wanner, 2012/06/19
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Stephen Leake, 2012/06/19
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone),
Markus Wanner <=
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Stephen Leake, 2012/06/21
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Hendrik Boom, 2012/06/11
- Re: [Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), Markus Wanner, 2012/06/12
[Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), code, 2012/06/19
[Monotone-devel] Updated Issue 209 - support drop/modified conflict (monotone), code, 2012/06/21