From: Darrin Thompson <darrint@progeny.com>
Date: Thu, 14 Jul 2005 18:24:21 GMT
Subject: Re: cg update failing
Message-ID: <1121365461.4729.0.camel@localhost.localdomain>
In-Reply-To: <m3oe95qn64.fsf@lugabout.cloos.reno.nv.us>

On Thu, 2005-07-14 at 14:04 -0400, James Cloos wrote:
> I'm getting this on my clone of linus' tree:
> 
> ,----
> | cg-merge: merge blocked: seeked from master
> `----
> 
> I've not found a way past it.

cg-seek master ?

--
Darrin