Re: fatal: git write-tree failed to write a tree
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Mar 3, 2009, 10:05 UTC
- Message-ID
- <alpine.DEB.1.00.0903031103580.6399@intel-tinevez-2-302>
- In-Reply-To
- <81bfc67a0903022147m42e8fe38gb93773084614d30@mail.gmail.com>
Hi,
On Tue, 3 Mar 2009, Caleb Cushing wrote:
Show 8 quoted lines
> 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...
You have a tree with unmerged entries. Why don't you look into the issue and solve it? A simple "git status" should show you what are the unmerged entries. A simple look at those files should show you conflict markers.
Resolve the issue, commit, continue.
Ciao, Dscho