[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: VC mode and git
From: |
Eli Zaretskii |
Subject: |
Re: VC mode and git |
Date: |
Tue, 31 Mar 2015 17:47:57 +0300 |
> 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.
- 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 <=
- 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, 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