{"thread":{"id":"18064","subject":"fatal: git write-tree failed to write a tree","startedAt":"2009-02-28T16:25:35Z","lastAt":"2009-03-03T17:18:22Z","messageCount":6,"participants":["Caleb Cushing","Johannes Schindelin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"106535","messageId":"81bfc67a0902280825t507e385bvd25c846add2a299c@mail.gmail.com","threadId":"18064","inReplyTo":null,"subject":"fatal: git write-tree failed to write a tree","fromName":"Caleb Cushing","fromEmail":"xenoterracide@gmail.com","sentAt":"2009-02-28T16:25:35Z","receivedAt":"2009-02-28T16:25:35Z","isPatch":false,"sender":{"key":"xenoterracide@gmail.com","avatar":"https://gravatar.com/avatar/af3f0745dfa0ea9c4ee551d7d0a3cfe7ba8d229754c11678ab2ed23c3fa57065?d=mp&s=160"},"body":"git merge java-overlay/master\nAdding profiles/package.mask/gentoo.org\nAdding profiles/package.mask/perl-experimental\nAdding profiles/package.mask/regen2.org\nAdding profiles/package.mask/sunrise\nprofiles/package.mask/java-overlay: unmerged\n(f67eeb638e2593b2bee5c9b476e3044a8404916a)\nfatal: git write-tree failed to write a tree\n\nnormally merges work fine... hmm...\n\n-- \nCaleb Cushing\n\nhttp://xenoterracide.blogspot.com\n"},{"id":"106634","messageId":"alpine.DEB.1.00.0903012210230.10279@pacific.mpi-cbg.de","threadId":"18064","inReplyTo":"81bfc67a0902280825t507e385bvd25c846add2a299c@mail.gmail.com","subject":"Re: fatal: git write-tree failed to write a tree","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2009-03-01T21:10:47Z","receivedAt":"2009-03-01T21:10:47Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Sat, 28 Feb 2009, Caleb Cushing wrote:\n\n> profiles/package.mask/java-overlay: unmerged\n> (f67eeb638e2593b2bee5c9b476e3044a8404916a)\n> fatal: git write-tree failed to write a tree\n\nA tree cannot contain unmerged files.\n\nCiao,\nDscho\n"},{"id":"106661","messageId":"81bfc67a0903011623qc1f47fas57c3c8cea2a47eba@mail.gmail.com","threadId":"18064","inReplyTo":"alpine.DEB.1.00.0903012210230.10279@pacific.mpi-cbg.de","subject":"Re: fatal: git write-tree failed to write a tree","fromName":"Caleb Cushing","fromEmail":"xenoterracide@gmail.com","sentAt":"2009-03-02T00:23:03Z","receivedAt":"2009-03-02T00:23:03Z","isPatch":false,"sender":{"key":"xenoterracide@gmail.com","avatar":"https://gravatar.com/avatar/af3f0745dfa0ea9c4ee551d7d0a3cfe7ba8d229754c11678ab2ed23c3fa57065?d=mp&s=160"},"body":"On Sun, Mar 1, 2009 at 4:10 PM, Johannes Schindelin\n wrote:\n> A tree cannot contain unmerged files.\n>\n\nI didn't do that, git did. I've tried running git reset --hard HEAD\n(and git status shows a clean tree before hand).\n\nso how can I resolve it?\n\n-- \nCaleb Cushing\n\nhttp://xenoterracide.blogspot.com\n"},{"id":"106763","messageId":"81bfc67a0903022147m42e8fe38gb93773084614d30@mail.gmail.com","threadId":"18064","inReplyTo":"alpine.DEB.1.00.0903012210230.10279@pacific.mpi-cbg.de","subject":"Re: fatal: git write-tree failed to write a tree","fromName":"Caleb Cushing","fromEmail":"xenoterracide@gmail.com","sentAt":"2009-03-03T05:47:41Z","receivedAt":"2009-03-03T05:47:41Z","isPatch":false,"sender":{"key":"xenoterracide@gmail.com","avatar":"https://gravatar.com/avatar/af3f0745dfa0ea9c4ee551d7d0a3cfe7ba8d229754c11678ab2ed23c3fa57065?d=mp&s=160"},"body":"On Sun, Mar 1, 2009 at 4:10 PM, Johannes Schindelin\n wrote:\n> A tree cannot contain unmerged files.\n\n\nso... still looking for a solution since it seems I can no longer do a\nmerge from this remote. There has to be a way to get the tree back\ninto a proper state...\n-- \nCaleb Cushing\n\nhttp://xenoterracide.blogspot.com\n"},{"id":"106809","messageId":"alpine.DEB.1.00.0903031103580.6399@intel-tinevez-2-302","threadId":"18064","inReplyTo":"81bfc67a0903022147m42e8fe38gb93773084614d30@mail.gmail.com","subject":"Re: fatal: git write-tree failed to write a tree","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2009-03-03T10:05:10Z","receivedAt":"2009-03-03T10:05:10Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Tue, 3 Mar 2009, Caleb Cushing wrote:\n\n> On Sun, Mar 1, 2009 at 4:10 PM, Johannes Schindelin\n> wrote:\n> > A tree cannot contain unmerged files.\n> \n> \n> so... still looking for a solution since it seems I can no longer do a\n> merge from this remote. There has to be a way to get the tree back\n> into a proper state...\n\nYou have a tree with unmerged entries. Why don't you look into the issue \nand solve it? A simple \"git status\" should show you what are the unmerged \nentries. A simple look at those files should show you conflict markers.\n\nResolve the issue, commit, continue.\n\nCiao,\nDscho\n"},{"id":"106888","messageId":"81bfc67a0903030918w3ccc88fcudfa8a2986e8e2415@mail.gmail.com","threadId":"18064","inReplyTo":"alpine.DEB.1.00.0903031103580.6399@intel-tinevez-2-302","subject":"Re: fatal: git write-tree failed to write a tree","fromName":"Caleb Cushing","fromEmail":"xenoterracide@gmail.com","sentAt":"2009-03-03T17:18:22Z","receivedAt":"2009-03-03T17:18:22Z","isPatch":false,"sender":{"key":"xenoterracide@gmail.com","avatar":"https://gravatar.com/avatar/af3f0745dfa0ea9c4ee551d7d0a3cfe7ba8d229754c11678ab2ed23c3fa57065?d=mp&s=160"},"body":">\n> You have a tree with unmerged entries.  Why don't you look into the issue\n> and solve it?  A simple \"git status\" should show you what are the unmerged\n> entries.  A simple look at those files should show you conflict markers.\n>\n> Resolve the issue, commit, continue.\n\nno... not so simple... git mergetool comes back with (c)reated\n(d)eleted files. I want the created one. when I choose that and\ncommit, no merge is capable of happening. it says (for that file) that\nthere is nothing to change, in fact if nothing else has changed the\nbranch will simply say nothing to commit once I've resolved it. all\ncommits at this point are simply commits.\n-- \nCaleb Cushing\n\nhttp://xenoterracide.blogspot.com\n"}]}