git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Caleb Cushing <xenoterracide@gmail.com>
Date
Mar 3, 2009, 17:18 UTC
Message-ID
<81bfc67a0903030918w3ccc88fcudfa8a2986e8e2415@mail.gmail.com>
In-Reply-To
<alpine.DEB.1.00.0903031103580.6399@intel-tinevez-2-302>
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
Previous: Johannes Schindelin
Message 6 of 6 in “fatal: git write-tree failed to write a tree”
  1. Caleb CushingFeb 28, 2009
  2. Johannes SchindelinMar 1, 2009
  3. Caleb CushingMar 2, 2009
  4. Caleb CushingMar 3, 2009
  5. Johannes SchindelinMar 3, 2009
  6. Caleb CushingMar 3, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.