>> 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 - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html