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: Tue, 3 Mar 2009 12:18:22 -0500 [thread overview]
Message-ID: <81bfc67a0903030918w3ccc88fcudfa8a2986e8e2415@mail.gmail.com> (raw)
In-Reply-To: <alpine.DEB.1.00.0903031103580.6399@intel-tinevez-2-302>
>
> 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
prev parent reply other threads:[~2009-03-03 17:19 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
2009-03-03 5:47 ` Caleb Cushing
2009-03-03 10:05 ` Johannes Schindelin
2009-03-03 17:18 ` Caleb Cushing [this message]
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=81bfc67a0903030918w3ccc88fcudfa8a2986e8e2415@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).