From: Darrin Thompson <darrint@progeny.com>
To: James Cloos <cloos+vger-git@jhcloos.com>
Cc: git@vger.kernel.org
Subject: Re: cg update failing
Date: Thu, 14 Jul 2005 13:24:21 -0500 [thread overview]
Message-ID: <1121365461.4729.0.camel@localhost.localdomain> (raw)
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
next prev parent reply other threads:[~2005-07-14 18:26 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-07-14 18:04 cg update failing James Cloos
2005-07-14 18:24 ` Darrin Thompson [this message]
2005-07-14 20:06 ` James Cloos
2005-07-14 21:21 ` Darrin Thompson
2005-07-14 21:50 ` James Cloos
2005-07-15 4:12 ` James Cloos
2005-07-20 1:07 ` Petr Baudis
2005-07-20 4:34 ` James Cloos
2005-07-20 8:12 ` Petr Baudis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1121365461.4729.0.camel@localhost.localdomain \
--to=darrint@progeny.com \
--cc=cloos+vger-git@jhcloos.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).