Len Brown <len.brown@xxxxxxxxx> writes: > I'm trying to use git-am to apply a patch series in a mailbox. > > The first patch has a conflict, which I edit to fix, and and then invoke > git am --3way --interactive --signoff --utf8 --resolved > > but it bails out with this: > > drivers/acpi/thermal.c: unmerged (4829f067a3e7acfbeed8b230caac00b1ed4b8554) > drivers/acpi/thermal.c: unmerged (528d198c28512af1627cce481575f37a599c0fe8) > drivers/acpi/thermal.c: unmerged (db3bef1a3e51801128e7553f3e546c8272cc9ee1) > fatal: git-write-tree: not able to write tree > > I've tried various incantations of git reset on the theory that there is some > old state hanging around someplace, but have not been able to check in this > file. > > clues? 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. I've considered making --resolved to do update-index for all paths that are unmerged in the index, but that risks going forward by mistake when you still have other paths to resolve, so... - : 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