From: Junio C Hamano <gitster@pobox.com>
To: Alex Vandiver <alex@chmrr.net>
Cc: git discussion list <git@vger.kernel.org>
Subject: Re: "fatal: git-write-tree: error building trees" from `git stash`
Date: Thu, 27 Dec 2012 10:51:49 -0800 [thread overview]
Message-ID: <7vsj6rl456.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1356631626.13818.126.camel@umgah.localdomain> (Alex Vandiver's message of "Thu, 27 Dec 2012 13:07:06 -0500")
Alex Vandiver <alex@chmrr.net> writes:
> Heya,
> I just ran into the following with `git stash`. The set-up:
> ...
> $ git stash pop
> Auto-merging foo
> CONFLICT (content): Merge conflict in foo
> Recorded preimage for 'foo'
>
> $ git stash
> foo: needs merge
> foo: needs merge
> foo: unmerged (aeaa7e5e87cf309a7368d5d92a71c1f9e6a8c9e7)
> foo: unmerged (a77fa514de2720c72c1a861de098595959a2c97a)
> foo: unmerged (4a622d2b991f1a19ba7be313a46dc6f03692cd0a)
> fatal: git-write-tree: error building trees
> Cannot save the current index state
This is totally expected, isn't it?
You do not save state in the middle of a conflict with "git stash"
(instead, you would "git stash" away your own work in progress
before you start operation that may create and leave conflicts).
next prev parent reply other threads:[~2012-12-27 18:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-27 18:07 "fatal: git-write-tree: error building trees" from `git stash` Alex Vandiver
2012-12-27 18:51 ` Junio C Hamano [this message]
2012-12-27 18:55 ` Alex Vandiver
2012-12-27 19:05 ` Jeff King
2012-12-27 20:11 ` Junio C Hamano
2012-12-27 19:21 ` 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=7vsj6rl456.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=alex@chmrr.net \
--cc=git@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox