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

Re: rerere fails to record resolution if file doesn't exist in merge base

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jul 9, 2007, 13:40 UTC
Message-ID
<Pine.LNX.4.64.0707091438540.5546@racer.site>
In-Reply-To
<20070709113543.GA12633@informatik.uni-freiburg.de>
Hi,
On Mon, 9 Jul 2007, Uwe Kleine-K?nig wrote:
> Junio C Hamano wrote:
>
> > Not even compile tested, but something like this should do.
> It compiles, but seems not to work.  I will try to make up a test.

I compiled it, and it works as expected. For safety, git-rerere leaves the index unmerged, so that you can verify that you wanted this resolution.

Will resubmit with a test case.

Ciao, Dscho

Previous: Uwe Kleine-KönigNext: Johannes Schindelin
Message 4 of 6 in “rerere fails to record resolution if file doesn't exist in merge base”
  1. Uwe Kleine-KönigJul 9, 2007
  2. Junio C HamanoJul 9, 2007
  3. Uwe Kleine-KönigJul 9, 2007
  4. Johannes SchindelinJul 9, 2007
  5. rerere: record resolution even if file is not in merge baseJohannes Schindelin, Jul 9, 2007
  6. Uwe Kleine-KönigJul 9, 2007

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.