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

Why doesn't git-rerere automatically commit a resolution?

From
Shawn Pearce <spearce@spearce.org>
Date
Jul 11, 2006, 06:16 UTC
Message-ID
<20060711061626.GB11822@spearce.org>

I'm curious... I have a pair of topic branches which don't merge together cleanly by recursive (due to conflicting hunks in the same line segments). I enabled git-rerere, ran the merge, fixed up the hunks and committed it. git-rerere built its cache, as the next time I pulled the two topic branches together and got the same conflicts it correctly regenerated the prior resolution (and printed a message saying as much).

But it git-rerere left the files unmerged in the index and it doesn't generate a commit for the merge, even though there are no merge conflicts remaining. I expected it to update the index (to merge the stages) and to generate a commit if possible; especially in this case as I was pulling the exact same two commits together again with the exact same merge base commit.

So I'm wondering why doesn't it try to finish the merge? Was there a really deep rooted reason behind it or was it simply easier/safer to let the user sort out the working directory state every time?

-- 
Shawn.
Next: Junio C Hamano
Message 1 of 4 in “Why doesn't git-rerere automatically commit a resolution?”
  1. Shawn PearceJul 11, 2006
  2. Junio C HamanoJul 11, 2006
  3. Shawn PearceJul 11, 2006
  4. Matthias KestenholzJul 11, 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.