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

Re: two-way merge corner case bug

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 1, 2013, 23:06 UTC
Message-ID
<7vppzien3i.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20130301223612.GA862@sigill.intra.peff.net>
Jeff King <peff@peff.net> writes:
Show 10 quoted lines
> On Fri, Mar 01, 2013 at 08:57:03AM -0800, Junio C Hamano wrote:
>> 
>> Nobody seems to use that combination, either from scripts or from C
>> (i.e. when opts.update==1 and opts.merge==1, opts.reset is not set)
>> with a twoway merge, other than "git am --abort/--skip".
>
> I can believe it. So do we want to do that fix, then? Did you want to
> roll up the two halves of it with a test and write a commit message? I
> feel like you could write a much more coherent one than I could on this
> subject.

I actually was wondering if we can remove that sole uses of two-way merge with --reset -u from "git am" and replace them with something else. But we do want to keep local change that existed before "am" started, so we cannot avoid use of two-way merge, I guess...

Previous: Jeff KingNext: Jeff King
Message 7 of 10 in “two-way merge corner case bug”
  1. Junio C HamanoFeb 26, 2013
  2. Jeff KingFeb 26, 2013
  3. Junio C HamanoFeb 26, 2013
  4. Jeff KingMar 1, 2013
  5. Junio C HamanoMar 1, 2013
  6. Jeff KingMar 1, 2013
  7. Junio C HamanoMar 1, 2013
  8. Jeff KingMar 1, 2013
  9. Junio C HamanoMar 1, 2013
  10. Jeff KingMar 2, 2013

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.