From: Caleb Cushing <xenoterracide@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: fatal: git write-tree failed to write a tree
Date: Sun, 1 Mar 2009 19:23:03 -0500 [thread overview]
Message-ID: <81bfc67a0903011623qc1f47fas57c3c8cea2a47eba@mail.gmail.com> (raw)
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
next prev parent reply other threads:[~2009-03-02 0:24 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-28 16:25 fatal: git write-tree failed to write a tree Caleb Cushing
2009-03-01 21:10 ` Johannes Schindelin
2009-03-02 0:23 ` Caleb Cushing [this message]
2009-03-03 5:47 ` Caleb Cushing
2009-03-03 10:05 ` Johannes Schindelin
2009-03-03 17:18 ` Caleb Cushing
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=81bfc67a0903011623qc1f47fas57c3c8cea2a47eba@mail.gmail.com \
--to=xenoterracide@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).