From: Junio C Hamano Date: Mon, 15 Sep 2014 19:25:25 GMT Subject: Re: git merge --abort deletes unstaged files Message-ID: In-Reply-To: <87k354x0qt.fsf@igel.home> Andreas Schwab writes: > André Hänsel 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.