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

git rerere to remember half-merged progress - valid use?

From
Ilya Kantor <iliakan@gmail.com>
Date
Mar 10, 2018, 14:22 UTC
Message-ID
<CAFU8umhtBxs9X+f1p3k8D6a4mue6OvM9cydrK-cRW8Nsq8Vcww@mail.gmail.com>
Hi,

Let's say I'm merging a branch with many conflicts. I resolved some of them, but then can't proceed or need to switch elsewhere.

Will it be a good practice to call `git rerere` to remember resolved conflicts, so that in the future when I re-merge, I get my half-done merge back?

I couldn't find such use of rerere in the internet.
How can I save the merge/restore progress otherwise?

--- Best Regards, Ilya Kantor

Next: Junio C Hamano
Message 1 of 2 in “git rerere to remember half-merged progress - valid use?”
  1. Ilya KantorMar 10, 2018
  2. Junio C HamanoMar 11, 2018

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.