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

Re: git merge (resolve) _is_ stupid

From
LTLuben Tuikov <ltuikov@yahoo.com>
Date
Jul 31, 2006, 17:12 UTC
Message-ID
<20060731171229.24870.qmail@web31802.mail.mud.yahoo.com>
In-Reply-To
<7v7j1u88ol.fsf@assigned-by-dhcp.cox.net>
I had seen something similar:

Merging linux-scsi into my own branches whereby both had a particular patch (03aba2f79594ca94d159c8bab454de9bcc385b76), git-merge complained that a resolve is needed.

After manually "resolving" the result was identical to either branch (linux-scsi and my own), so in fact the diff was 0.

I found this strange, but due to lack of time couldn't pursue it further.

    Luben
Previous: Johannes Schindelin
Message 5 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.