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

Re: [PATCH v3] mergetool: add automerge configuration

From
Junio C Hamano <gitster@pobox.com>
Date
Dec 18, 2020, 10:34 UTC
Message-ID
<xmqqwnxftnbk.fsf@gitster.c.googlers.com>
In-Reply-To
<5fdc16b8de8c1_f2faf208ad@natae.notmuch>
Felipe Contreras <felipe.contreras@gmail.com> writes:
> Right, althought the user can't configure otherwise, and the default 7,
> it can't hurt to add it.

Yes, that would make it certain that the code would survive the change in the underlying xmerge part of the system.

I am still not sure what the right plan to deal with conflicts recorded in the virtual ancestor. Do we just close our eyes and ignore it?

An easy way out may be to give an command line override so that users can easily re-run mergetool with the feature disabled only for a single invocation that went wrong, which would make it less likely that users disable the feature permanently upon seeing just one case of the new logic getting confused.

Previous: Felipe ContrerasNext: Felipe Contreras
Message 6 of 7 in “mergetool: add automerge configuration”
  1. mergetool: add automerge configurationFelipe Contreras, Dec 17, 2020
  2. Johannes SixtDec 17, 2020
  3. Felipe ContrerasDec 17, 2020
  4. Junio C HamanoDec 18, 2020
  5. Felipe ContrerasDec 18, 2020
  6. Junio C HamanoDec 18, 2020
  7. Felipe ContrerasDec 18, 2020

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.