Re: "fatal: git-write-tree: error building trees" from `git stash`

From: Alex Vandiver <alex@chmrr.net>
Date: Dec 27, 2012, 18:55 UTC
Message-ID: <1356634556.13818.136.camel@umgah.localdomain>
In-Reply-To: <7vsj6rl456.fsf@alter.siamese.dyndns.org>

On Thu, 2012-12-27 at 10:51 -0800, Junio C Hamano wrote:

Show 14 quoted lines

> > $ 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).

Apologies for not being clear.  While being unable to stash is not
unexpected, perhaps, "Cannot stash while resolving conflicts" or similar
would be more understandable to the end user than the above.
 - Alex