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

cg-update/cg-merge refuse to update if state is dirty?

From
Martin Langhoff <martin.langhoff@gmail.com>
Date
Aug 23, 2005, 08:09 UTC
Message-ID
<46a038f905082301096285a3cb@mail.gmail.com>

Should cg-update or cg-merge be refusing to merge if the tree is dirty? If there are uncommitted files, and the merge fails, a lot of unrelated changes will be dumped on the working tree, which ends up with a mix of things.

cheers,
martin
Next: Carl Baldwin
Message 1 of 2 in “cg-update/cg-merge refuse to update if state is dirty?”
  1. Martin LanghoffAug 23, 2005
  2. Carl BaldwinAug 23, 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.