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

Re: rerere.autoupdate that wouldn't

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 9, 2012, 22:46 UTC
Message-ID
<7vd38l4cl5.fsf@alter.siamese.dyndns.org>
In-Reply-To
<4F5A8580.1010807@cisco.com>
Phil Hord <hordp@cisco.com> writes:
> Is this what is supposed to happen?  Should I look into adding
> 'rerere.autoContinue=true'?
"Yes", and "Perhaps, but there may be a better alternative".

Whatever rerere did, "git merge", "git am", and friends should report the fact that the result is not just a trivial conflict-free merge, so that the user can take an appropriate action. Otherwise you will be robbing the last chance to eyeball the result from people who have been using rerere.autoupdate=true and doing so before committing.

And a better alternative to make "rerere.autoupdate" stronger may be to make the variable tri-valued, instead of adding a new variable that does not make any sense when rerere.autoupdate is not set.

Previous: Phil HordNext: Phil Hord
Message 2 of 3 in “rerere.autoupdate that wouldn't”
  1. Phil HordMar 9, 2012
  2. Junio C HamanoMar 9, 2012
  3. Phil HordMar 9, 2012

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.