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

Re: git merge (resolve) _is_ stupid

From
Junio C Hamano <junkio@cox.net>
Date
Jul 31, 2006, 11:01 UTC
Message-ID
<7v7j1u6nsx.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<Pine.LNX.4.63.0607311236070.29667@wbgn013.biozentrum.uni-wuerzburg.de>
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> The culprit is the call to parse_commit() in merge_bases(). How about 
> this?

Do you mean merge_bases() in commit.c which is called by get_merge_bases()? If so the patch feels like papering over a more grave bug -- the result from make_virtual_commit does not seem to have any proper parent information, so how is merge_bases() expected to return anything sensible?

I am confused, but going to bed first.
Previous: Johannes SchindelinNext: Johannes Schindelin
Message 3 of 5 in “git merge (resolve) _is_ stupid”
  1. Junio C HamanoJul 31, 2006
  2. Johannes SchindelinJul 31, 2006
  3. Junio C HamanoJul 31, 2006
  4. Johannes SchindelinJul 31, 2006
  5. Luben TuikovJul 31, 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.