[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: Tue, 31 Mar 2015 10:25:21 +0200
User-agent: Postbox 3.0.11 (Macintosh/20140602)

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.

If you say so. But then why do we see this warning from “git help merge”?

       Warning: Running git merge with non-trivial
       uncommitted changes is discouraged: while possible,
       it may leave you in a state that is hard to back out
       of in the case of a conflict.

– Harald

reply via email to

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