From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Mar 2012 17:14:21 GMT
Subject: Re: Strange effect merging empty file
Message-ID: <7v62dx3mhe.fsf@alter.siamese.dyndns.org>
In-Reply-To: <4F69B375.5050205@in.waw.pl>

Zbigniew Jędrzejewski-Szmek  <zbyszek@in.waw.pl> writes:

> # Merge import 1.0 and remove the empty file
> git merge  --no-edit import^
> git rm empty.txt
> git commit -m 'Remove empty file'
>
> # Merge import 1.1 and watch empty.txt contents show up in .gitignore
> git merge --no-edit import
> cat .gitignore

Given what merge-recursive does, I am not very surprised, even though I
agree that it feels like a very surprising end user experience ;-)