From: Junio C Hamano Date: Tue, 12 Aug 2014 18:31:49 GMT Subject: Re: [PATCH] read-cache.c: Ensure unmerged entries are removed Message-ID: In-Reply-To: <1407857491-16633-1-git-send-email-jsorianopastor@gmail.com> Jaime Soriano Pastor writes: > A file in the index can be left as merged and unmerged at the same time > by some tools as libgit2, this causes some undesiderable behaviours in git. Well, doesn't it mean that libgit2 is broken? Have you filed a bug over there yet? Having said that, protecting ourselves from insanity left by other people is always a good idea, provided that it can be done without bending overly backwards.