Zack Weinberg wrote:
On 9/23/07, Derek Scherger [EMAIL PROTECTED] wrote:
I've been playing around a bit with the rather cryptic messages that
monotone generates on so called non-content conflicts and hopefully have
improved things a bit.
Cool! Your revisions are definitely better than what
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
Zack Weinberg [EMAIL PROTECTED] writes:
On 9/23/07, Derek Scherger [EMAIL PROTECTED] wrote:
I've been playing around a bit with the rather cryptic messages that
monotone generates on so called non-content conflicts and hopefully have
improved things a bit.
Cool! Your revisions are
Zack Weinberg wrote:
Cool! Your revisions are definitely better than what we had, but I
think they could be even better still.
What? Impossible! ;)
The term 'node' is only clear if you're familiar with monotone
internals. I'd suggest checking what kind of node it is and
substituting
