[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 16:52:34 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) |
Eli Zaretskii <address@hidden> writes:
>> From: Andreas Schwab <address@hidden>
>> Date: Tue, 31 Mar 2015 16:39:24 +0200
>> Cc: address@hidden, address@hidden,
>> Dmitry Gutov <address@hidden>
>>
>> Eli Zaretskii <address@hidden> writes:
>>
>> >> Date: Tue, 31 Mar 2015 17:26:41 +0300
>> >> From: Dmitry Gutov <address@hidden>
>> >> CC: address@hidden
>> >>
>> >> On 03/31/2015 05:07 PM, Eli Zaretskii wrote:
>> >> > Nothing, IME. Contrary to the cited text, "git pull" with uncommitted
>> >> > changes doesn't fail. I do this every time before committing a
>> >> > changeset I intend to push, and it always worked for me.
>> >>
>> >> Neither is exactly true. Since 1.7.0 or so, "git pull" with uncommitted
>> >> changes can succeed if the newly pulled changes don't touch the locally
>> >> changed files, but will fail otherwise. Which makes a lot of sense.
>> >
>> > Yes, and is expected. Even CVS did that ;-)
>>
>> No, CVS overwrites your changed files unconditionally.
>
> And makes a merge conflict, AFAIR.
Unconditionally.
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, Steinar Bang, 2015/03/31
- Re: VC mode and git, Steinar Bang, 2015/03/31
- Re: VC mode and git, Sebastien Vauban, 2015/03/31
- Re: VC mode and git, Eli Zaretskii, 2015/03/31
- Re: VC mode and git, Dmitry Gutov, 2015/03/31
- Re: VC mode and git, Eli Zaretskii, 2015/03/31
- Re: VC mode and git, Andreas Schwab, 2015/03/31
- Re: VC mode and git, Eli Zaretskii, 2015/03/31
- Re: VC mode and git,
Andreas Schwab <=
- Re: VC mode and git, Eli Zaretskii, 2015/03/31
- Re: VC mode and git, Stephen J. Turnbull, 2015/03/31
- Re: VC mode and git, Steinar Bang, 2015/03/31
- Re: VC mode and git, Stephen J. Turnbull, 2015/03/31
- Re: VC mode and git, Alan Mackenzie, 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, Stephen J. Turnbull, 2015/03/31
- Re: VC mode and git, Richard Stallman, 2015/03/31
- Re: VC mode and git, Stephen J. Turnbull, 2015/03/31