[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: VC mode and git
From: |
Andreas Schwab |
Subject: |
Re: VC mode and git |
Date: |
Tue, 31 Mar 2015 10:36:29 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) |
Harald Hanche-Olsen <address@hidden> writes:
> 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”?
That is about files that are not modified by the merge.
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."
- Re: VC mode and git, (continued)
- Re: VC mode and git, Stephen J. Turnbull, 2015/03/30
- Re: VC mode and git, Eli Zaretskii, 2015/03/30
- Re: VC mode and git, Stephen J. Turnbull, 2015/03/31
- Re: VC mode and git, Harald Hanche-Olsen, 2015/03/31
- Re: VC mode and git, Harald Hanche-Olsen, 2015/03/31
- Re: VC mode and git, Andreas Schwab, 2015/03/31
- Re: VC mode and git, Harald Hanche-Olsen, 2015/03/31
- Re: VC mode and git, Richard Stallman, 2015/03/31
- Re: VC mode and git, Andreas Schwab, 2015/03/31
- Re: VC mode and git, Harald Hanche-Olsen, 2015/03/31
- Re: VC mode and git,
Andreas Schwab <=
- Re: VC mode and git, Richard Stallman, 2015/03/31
- Re: VC mode and git, Andreas Schwab, 2015/03/31
- Re: VC mode and git, Harald Hanche-Olsen, 2015/03/31
- Re: VC mode and git, Eli Zaretskii, 2015/03/31
- Re: VC mode and git, Harald Hanche-Olsen, 2015/03/31
- Re: VC mode and git, Eli Zaretskii, 2015/03/31
- Re: VC mode and git, Harald Hanche-Olsen, 2015/03/31
- Re: VC mode and git, Stephen J. Turnbull, 2015/03/31
- Re: VC mode and git, Eli Zaretskii, 2015/03/31
- Re: VC mode and git, Steinar Bang, 2015/03/31