threads / discuss / 18064

fatal: git write-tree failed to write a tree

Subject: fatal: git write-tree failed to write a tree

## tl;dr

6 messages between Feb 28, 2009 and Mar 3, 2009.

replies: 5people: 2as markdown or json

Caleb Cushing· Feb 28, 2009, 16:25 UTC · lore

git merge java-overlay/master Adding profiles/package.mask/gentoo.org Adding profiles/package.mask/perl-experimental Adding profiles/package.mask/regen2.org Adding profiles/package.mask/sunrise profiles/package.mask/java-overlay: unmerged (f67eeb638e2593b2bee5c9b476e3044a8404916a) fatal: git write-tree failed to write a tree

normally merges work fine... hmm...

-- 
Caleb Cushing

http://xenoterracide.blogspot.com

Johannes Schindelin· Mar 1, 2009, 21:10 UTC · re: Caleb Cushing · lore

Re: fatal: git write-tree failed to write a tree

Hi,

On Sat, 28 Feb 2009, Caleb Cushing wrote:

> profiles/package.mask/java-overlay: unmerged
> (f67eeb638e2593b2bee5c9b476e3044a8404916a)
> fatal: git write-tree failed to write a tree

A tree cannot contain unmerged files.

Ciao, Dscho

Caleb Cushing· Mar 2, 2009, 00:23 UTC · re: Johannes Schindelin · lore

Re: fatal: git write-tree failed to write a tree

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

Caleb Cushing· Mar 3, 2009, 05:47 UTC · re: Johannes Schindelin · lore

Re: fatal: git write-tree failed to write a tree

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

Johannes Schindelin· Mar 3, 2009, 10:05 UTC · re: Caleb Cushing · lore

Re: fatal: git write-tree failed to write a tree

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

Caleb Cushing· Mar 3, 2009, 17:18 UTC · re: Johannes Schindelin · lore

Re: fatal: git write-tree failed to write a tree

Show 6 quoted lines

>
> 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.

no... not so simple... git mergetool comes back with (c)reated (d)eleted files. I want the created one. when I choose that and commit, no merge is capable of happening. it says (for that file) that there is nothing to change, in fact if nothing else has changed the branch will simply say nothing to commit once I've resolved it. all commits at this point are simply commits.

-- 
Caleb Cushing

http://xenoterracide.blogspot.com