RE: fatal: git-write-tree: not able to write tree
- From
Brown, Len <len.brown@intel.com>
- Date
- Apr 28, 2006, 08:43 UTC
- Message-ID
- <CFF307C98FEABE47A452B27C06B85BB64A432C@hdsmsx411.amr.corp.intel.com>
>> git am --3way --interactive --signoff --utf8 --resolved
>Please say "--resolved" after you have actually resolved them, >eh, meaning, (1) edit the working tree file into a desired >shape, and (2) git-update-index drivers/acpi/thermal.c.
Thanks Junio, once again, for your help, we're up and running!
I'm okay with git being conservative and not doing the update-index for me. Perhaps the thing to do here is to make the failure message more useful?
"fatal: git-write-tree: not able to write tree"
everything after "fatal" here is effectively a string of random characters to the hapless user.
thanks, -Len