[Top][All Lists]

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

Re: VC mode and git

From: Alan Mackenzie
Subject: Re: VC mode and git
Date: Tue, 31 Mar 2015 08:50:55 +0000
User-agent: Mutt/1.5.23 (2014-03-12)

Hello, Andreas.

On Tue, Mar 31, 2015 at 09:35:07AM +0200, Andreas Schwab wrote:
> Harald Hanche-Olsen <address@hidden> writes:

> > The *only* possible data loss is in lisp/ChangeLog, since that was (I
> > believe) in an edited, uncommitted state when he did the pull.

> git would have refused to start the merge if that were the case.

That is the case in the current git version.  I think that in previous
versions, git took the liberty of simply overwriting changed files in
the workspace.  At least, I think that's what happened to me a couple of
times around the beginning of the year.

Why can't git simply merge changes properly into the workspace, thus
saving users the unwelcome hassle of, e.g., git stash followed by git
merge followed by git stash pop?

> Andreas.

> -- 
> Andreas Schwab, SUSE Labs, address@hidden
> GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
> "And now for something completely different."

Alan Mackenzie (Nuremberg, Germany).

reply via email to

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