Re: VC mode and git

[Harald Hanche-Olsen]

Harald Hanche-Olsen wrote:
> Apropos of that, I have a question for the git experts out there.
> […]
>  From this it is my guess that stashing in the middle of a merge with
> conflicts is not safe, as the stash is not capable of holding multiple
> versions of a single file. Or am I wrong about that?

It appears I have stumbled upon the answer here:
http://git.661346.n2.nabble.com/quot-fatal-git-write-tree-error-building-trees-quot-from-git-stash-td7573736.html
That post contains this bit:

$ 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

So git stash will very visibly fail in this situation.
And that is good to know. (Lookm there is that “error building trees” 
message again!)

– Harald