Re: [Monotone-devel] non-content conflict messages

[Daniel Carosone]

On Sun, Sep 23, 2007 at 09:22:11PM -0700, Zack Weinberg wrote:
> [much good discussion]
> 
> > The other thing we should do is add a more detailed section on conflicts
> > to the manual that lists all of these with some hints on how they occur
> > and what to do about them. I'll probably make a first pass at that as I
> > clean this stuff up.
> 
> This would definitely be good, but I don't think it substitutes for
> the diagnostics themselves making clear how the situation occurred.

Just enumerating all the cases and working through all the pertinent
details for what happened vs what's meaningful to the user is a huge
start.  Then we can improve both the in-program and external
documentation together.  Maybe even tabulate all the cases with short
names and a basic summary or a little diagram?

--
Dan.

pgpdpdXGML0Zw.pgp
Description: PGP signature