[Monotone-devel] a little *-merge history

2007-01-23 Thread Lapo Luchini
Nathaniel J. Smith wrote: So, I've been thinking -- always dangerous -- about merging again Ah! I've done that dangerous thing too, and finally managed to read it all, step by step, and finally been able if not to the extent of grokking, at least to have a base understanding of that star-stuff

Re: [Monotone-devel] a little *-merge history

2007-01-23 Thread Nathaniel J. Smith
On Wed, Jan 24, 2007 at 02:57:14AM +0100, Lapo Luchini wrote: Nathaniel J. Smith wrote: So, I've been thinking -- always dangerous -- about merging again Ah! I've done that dangerous thing too, and finally managed to read it all, step by step, and finally been able if not to the extent

Re: [Monotone-devel] a little *-merge history

2007-01-23 Thread Daniel Carosone
On Tue, Jan 23, 2007 at 09:44:33PM -0800, Nathaniel J. Smith wrote: mark stuff is sort of the preferred term, though I admit that I always catch myself calling it star-merge in my own head. The problem is that star merge means something _completely_ different (and a bit batty) in old arch