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

Re: git merge --abort deletes unstaged files

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 15, 2014, 19:25 UTC
Message-ID
<xmqq61go65zu.fsf@gitster.dls.corp.google.com>
In-Reply-To
<87k354x0qt.fsf@igel.home>
Andreas Schwab <schwab@linux-m68k.org> writes:
Show 7 quoted lines
> André Hänsel <andre@webkr.de> writes:
>
>> I ran git merge to merge a branch. There were some conflicted files.
>> Although they were automatically resolved by git rerere, I still had to add
>> them.
>
> If you want them to be added automatically, set rerere.autoupdate=true.

I would have to caution against doing so without thinking, though. In other words, it is OK if you are Andreas who knows what he is doing, but it is not a very good advice to give to random newbies.

"rerere" will apply whatever matching previous resolution, which may hopefully be the correct resolution this time too, but it is a good habit to get into to double check if such a merely textual side-port of previous resolution is really applicable to the current conflict.

Previous: Andreas SchwabNext: Andreas Schwab
Message 3 of 6 in “git merge --abort deletes unstaged files”
  1. André HänselSep 15, 2014
  2. Andreas SchwabSep 15, 2014
  3. Junio C HamanoSep 15, 2014
  4. Andreas SchwabSep 15, 2014
  5. Junio C HamanoSep 15, 2014
  6. Andreas SchwabSep 15, 2014

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.