git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: cg update failing

From
DTDarrin Thompson <darrint@progeny.com>
Date
Jul 14, 2005, 21:21 UTC
Message-ID
<1121376069.4729.2.camel@localhost.localdomain>
In-Reply-To
<m3k6jtnod8.fsf@lugabout.cloos.reno.nv.us>
On Thu, 2005-07-14 at 16:06 -0400, James Cloos wrote:
Show 8 quoted lines
> >>>>> "Darrin" == Darrin Thompson <darrint@progeny.com> writes:
> 
> JimC> cg-merge: merge blocked: seeked from master `----
> 
> Darrin> cg-seek master ?
> 
> :; cg seek master
> On commit 514fd7fd01d378a7b5584c657d9807fc28f22079
Now your merge should not be blocked. No?

-- Darrin

Previous: James CloosNext: James Cloos
Message 4 of 9 in “cg update failing”
  1. James CloosJul 14, 2005
  2. Darrin ThompsonJul 14, 2005
  3. James CloosJul 14, 2005
  4. Darrin ThompsonJul 14, 2005
  5. James CloosJul 14, 2005
  6. James CloosJul 15, 2005
  7. Petr BaudisJul 20, 2005
  8. James CloosJul 20, 2005
  9. Petr BaudisJul 20, 2005

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.