[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: VC mode and git

From: Harald Hanche-Olsen
Subject: Re: VC mode and git
Date: Sun, 05 Apr 2015 22:18:49 +0200
User-agent: Postbox 3.0.11 (Macintosh/20140602)

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:
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

reply via email to

[Prev in Thread] Current Thread [Next in Thread]