From: Caleb Cushing <xenoterracide@gmail.com>
Date: Mon, 02 Mar 2009 00:23:03 GMT
Subject: Re: fatal: git write-tree failed to write a tree
Message-ID: <81bfc67a0903011623qc1f47fas57c3c8cea2a47eba@mail.gmail.com>
In-Reply-To: <alpine.DEB.1.00.0903012210230.10279@pacific.mpi-cbg.de>

On Sun, Mar 1, 2009 at 4:10 PM, Johannes Schindelin
<Johannes.Schindelin@gmx.de> wrote:
> A tree cannot contain unmerged files.
>

I didn't do that, git did. I've tried running git reset --hard HEAD
(and git status shows a clean tree before hand).

so how can I resolve it?

-- 
Caleb Cushing

http://xenoterracide.blogspot.com