Subject: Re: git merge --abort deletes unstaged files

From: Andreas Schwab <[email-masked]>
Date: Mon, 15 Sep 2014 19:16:42 +0200

André Hänsel <[email-masked]> 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.

Andreas.

-- 
Andreas Schwab, [email-masked]
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."