{"thread":{"id":"3982","subject":"fatal: git-write-tree: not able to write tree","startedAt":"2006-04-28T08:30:33Z","lastAt":"2006-04-28T08:32:59Z","messageCount":2,"participants":["Len Brown","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"19218","messageId":"200604280430.33100.len.brown@intel.com","threadId":"3982","inReplyTo":null,"subject":"fatal: git-write-tree: not able to write tree","fromName":"Len Brown","fromEmail":"len.brown@intel.com","sentAt":"2006-04-28T08:30:33Z","receivedAt":"2006-04-28T08:30:33Z","isPatch":false,"sender":{"key":"len.brown@intel.com","avatar":"https://gravatar.com/avatar/a091f34f66caadb51d85a8a496800c6ccae73737e2f45762373e6b8c55fa5dd6?d=mp&s=160"},"body":"I'm trying to  use git-am to apply a patch series in a mailbox.\n\nThe first patch has a conflict, which I edit to fix, and and then invoke\ngit am --3way --interactive --signoff --utf8 --resolved\n\nbut it bails out with this:\n\ndrivers/acpi/thermal.c: unmerged (4829f067a3e7acfbeed8b230caac00b1ed4b8554)\ndrivers/acpi/thermal.c: unmerged (528d198c28512af1627cce481575f37a599c0fe8)\ndrivers/acpi/thermal.c: unmerged (db3bef1a3e51801128e7553f3e546c8272cc9ee1)\nfatal: git-write-tree: not able to write tree\n\nI've tried various incantations of git reset on the theory that there is some \nold state hanging around someplace, but have not been able to check in this \nfile.\n\nclues?\n\nthanks,\n-Len\n"},{"id":"19219","messageId":"7vd5f2drr8.fsf@assigned-by-dhcp.cox.net","threadId":"3982","inReplyTo":"200604280430.33100.len.brown@intel.com","subject":"Re: fatal: git-write-tree: not able to write tree","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-04-28T08:32:59Z","receivedAt":"2006-04-28T08:32:59Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Len Brown <len.brown@intel.com> writes:\n\n> I'm trying to  use git-am to apply a patch series in a mailbox.\n>\n> The first patch has a conflict, which I edit to fix, and and then invoke\n> git am --3way --interactive --signoff --utf8 --resolved\n>\n> but it bails out with this:\n>\n> drivers/acpi/thermal.c: unmerged (4829f067a3e7acfbeed8b230caac00b1ed4b8554)\n> drivers/acpi/thermal.c: unmerged (528d198c28512af1627cce481575f37a599c0fe8)\n> drivers/acpi/thermal.c: unmerged (db3bef1a3e51801128e7553f3e546c8272cc9ee1)\n> fatal: git-write-tree: not able to write tree\n>\n> I've tried various incantations of git reset on the theory that there is some \n> old state hanging around someplace, but have not been able to check in this \n> file.\n>\n> clues?\n\nPlease say \"--resolved\" after you have actually resolved them,\neh, meaning, (1) edit the working tree file into a desired\nshape, and (2) git-update-index drivers/acpi/thermal.c.\n\nI've considered making --resolved to do update-index for all\npaths that are unmerged in the index, but that risks going\nforward by mistake when you still have other paths to resolve,\nso...\n"}]}