Re: git merge --abort deletes unstaged files

> Junio C Hamano <gitster@pobox.com> writes:
>
>> Andreas Schwab <schwab@linux-m68k.org> writes:
>>
>>> 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.
>
> If you are used to doing "git add ." afterwards it can't be much worse.