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

Re: [PATCH] Really fix git-merge-one-file-script this time.

From
Junio C Hamano <junkio@cox.net>
Date
May 1, 2005, 21:32 UTC
Message-ID
<7v64y2skdp.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<Pine.LNX.4.58.0505011312080.2296@ppc970.osdl.org>
>>>>> "LT" == Linus Torvalds <torvalds@osdl.org> writes:

LT> In particular, I think the "apply the patch forward" (that cogito does) is LT> as wrong with the "local modifications" as it is for the merge itself, and LT> that a truly good merge would actually have _another_ three-way merge on LT> the working file - the "original" is the version in our old HEAD branch, LT> with the two branches being merged are "working copy before the merge" and LT> "merge results".

Funny that I realize that is exactly how I've been doing my merges with you.

Previous: Linus Torvalds
Message 6 of 6 in “Really fix git-merge-one-file-script this time.”
  1. Really fix git-merge-one-file-script this time.Junio C Hamano, May 1, 2005
  2. Junio C HamanoMay 1, 2005
  3. Linus TorvaldsMay 1, 2005
  4. Junio C HamanoMay 1, 2005
  5. Linus TorvaldsMay 1, 2005
  6. Junio C HamanoMay 1, 2005

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.