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

Avoiding uninteresting merges in Cairo

From
Shawn Pearce <spearce@spearce.org>
Date
Dec 15, 2006, 02:06 UTC
Message-ID
<20061215020629.GK26202@spearce.org>

I was just talking with jwatt today in #git and he pointed me at the following email from

 http://lists.freedesktop.org/archives/cairo/2006-April/006648.html

after he had a merge gone wrong in his working directory and was asking for help.

Cario has seriously been using `reset --hard HEAD^` as part of its workflow since April? Why haven't you pushed for a rebase merge strategy to be tried before a trivial index merge as an option in git-merge (e.g. pull.twohead=rebase recursive)?

Next: Carl Worth
Message 1 of 8 in “Avoiding uninteresting merges in Cairo”
  1. Shawn PearceDec 15, 2006
  2. Carl WorthDec 15, 2006
  3. Shawn PearceDec 15, 2006
  4. Carl WorthDec 15, 2006
  5. Shawn PearceDec 15, 2006
  6. Jakub NarebskiDec 15, 2006
  7. Shawn PearceDec 15, 2006
  8. Junio C HamanoDec 15, 2006

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.