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

Re: [BUG] fatal error during merge

From
AMAnders Melchiorsen <mail@cup.kalibalik.dk>
Date
May 11, 2009, 07:37 UTC
Message-ID
<41870.bFoQE3daRhY=.1242027423.squirrel@webmail.hotelhot.dk>
In-Reply-To
<20090510163336.GA27241@blimp.localdomain>
On Sun, 10 May 2009 18:33:36 +0200, Alex Riesen <raa.lkml@gmail.com> wrote:
> I still have the patch below (rebased) in my tree.
> Was the problem fixed somehow differently?
> Subject: [PATCH] Update index after refusing to rewrite files unchanged
> during merge
I tested recently, and it does not appear to be fixed yet.

However, your patch was not enough to fix my test case completely, so I am unsure whether it makes sense to apply it as a partial fix.

The test is here:
   http://article.gmane.org/gmane.comp.version-control.git/116999
Anders.
Previous: Alex RiesenNext: Johannes Schindelin
Message 4 of 5 in “Re: [BUG] fatal error during merge”
  1. Alex RiesenMay 10, 2009
  2. Johannes SchindelinMay 10, 2009
  3. Alex RiesenMay 11, 2009
  4. Anders MelchiorsenMay 11, 2009
  5. Johannes SchindelinMay 11, 2009

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.