From mboxrd@z Thu Jan  1 00:00:00 1970
From: Darrin Thompson <darrint@progeny.com>
Subject: Re: cg update failing
Date: Thu, 14 Jul 2005 13:24:21 -0500
Message-ID: <1121365461.4729.0.camel@localhost.localdomain>
References: <m3oe95qn64.fsf@lugabout.cloos.reno.nv.us>
Mime-Version: 1.0
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Cc: git@vger.kernel.org
X-From: git-owner@vger.kernel.org Thu Jul 14 20:27:00 2005
Return-path: <git-owner@vger.kernel.org>
Received: from vger.kernel.org ([12.107.209.244])
	by ciao.gmane.org with esmtp (Exim 4.43)
	id 1Dt8PM-0001SF-Gr
	for gcvg-git@gmane.org; Thu, 14 Jul 2005 20:26:04 +0200
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S263074AbVGNSZ1 (ORCPT <rfc822;gcvg-git@m.gmane.org>);
	Thu, 14 Jul 2005 14:25:27 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S263073AbVGNSZ1
	(ORCPT <rfc822;git-outgoing>); Thu, 14 Jul 2005 14:25:27 -0400
Received: from zealot.progeny.com ([216.37.46.162]:63713 "EHLO
	morimoto.progeny.com") by vger.kernel.org with ESMTP
	id S263074AbVGNSYa (ORCPT <rfc822;git@vger.kernel.org>);
	Thu, 14 Jul 2005 14:24:30 -0400
Received: from dhcp-2-246.progeny.com (dhcp-2-246.progeny.com [192.168.2.246])
	by morimoto.progeny.com (Postfix) with ESMTP
	id 5A4E0636AB; Thu, 14 Jul 2005 13:24:21 -0500 (EST)
To: James Cloos <cloos+vger-git@jhcloos.com>
In-Reply-To: <m3oe95qn64.fsf@lugabout.cloos.reno.nv.us>
X-Mailer: Evolution 2.2.3 
Sender: git-owner@vger.kernel.org
Precedence: bulk
X-Mailing-List: git@vger.kernel.org

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