From: Junio C Hamano <junkio@cox.net>
To: Len Brown <len.brown@intel.com>
Cc: git@vger.kernel.org
Subject: Re: fatal: git-write-tree: not able to write tree
Date: Fri, 28 Apr 2006 01:32:59 -0700 [thread overview]
Message-ID: <7vd5f2drr8.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <200604280430.33100.len.brown@intel.com> (Len Brown's message of "Fri, 28 Apr 2006 04:30:33 -0400")
Len Brown <len.brown@intel.com> 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...
next prev parent reply other threads:[~2006-04-28 8:33 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-04-28 8:30 fatal: git-write-tree: not able to write tree Len Brown
2006-04-28 8:32 ` Junio C Hamano [this message]
-- strict thread matches above, loose matches on Subject: below --
2006-04-28 8:43 Brown, Len
2006-04-28 9:01 ` Junio C Hamano
2006-04-29 13:23 colin
2006-04-29 18:34 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vd5f2drr8.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=len.brown@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.