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

spurious fail of git merge after rebasing

From
DDD. A. van Delft <davd@bart.nl>
Date
Apr 15, 2011, 22:45 UTC
Message-ID
<201104160045.12633.davd@bart.nl>
Hi,

not sure if this is the right place, but I couldn't find a bugzilla or something for git.

Point is, I have found a scenario where sometimes git fails on a specific merge. Each time I start with the same identical git repository (archived once and restored each time before a run) and run the same fixed series of rebases and merges on it. Once in a while it fails with a merge conflict, sometimes at first try, sometimes after 10+ times. I have a canned set of testcases which reproduces this behaviour. I have also narrowed it down somewhat on how to work around, or prevent it from occurring.

However, given that it doesn't always fail or succeed, is unexpected.

regards, Danny A. van Delft

Next: Jeff King
Message 1 of 3 in “spurious fail of git merge after rebasing”
  1. D. A. van DelftApr 15, 2011
  2. Jeff KingApr 18, 2011
  3. Danny van DelftApr 18, 2011

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.