fatal: git write-tree failed to write a tree

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

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

On Sun, Mar 1, 2009 at 4:10 PM, Johannes Schindelin
[off-list ref] 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

On Sun, Mar 1, 2009 at 4:10 PM, Johannes Schindelin
[off-list ref] 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

Hi,

On Tue, 3 Mar 2009, Caleb Cushing wrote:

On Sun, Mar 1, 2009 at 4:10 PM, Johannes Schindelin
[off-list ref] wrote:

quoted

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

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