From: Caleb Cushing <xenoterracide@gmail.com>
Date: Tue, 03 Mar 2009 05:47:41 GMT
Subject: Re: fatal: git write-tree failed to write a tree
Message-ID: <81bfc67a0903022147m42e8fe38gb93773084614d30@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.


so... still looking for a solution since it seems I can no longer do a
merge from this remote. There has to be a way to get the tree back
into a proper state...
-- 
Caleb Cushing

http://xenoterracide.blogspot.com