[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: VC mode and git
From: |
Steinar Bang |
Subject: |
Re: VC mode and git |
Date: |
Sun, 05 Apr 2015 08:43:31 +0200 |
User-agent: |
Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.4 (gnu/linux) |
>>>>> "Stephen J. Turnbull" <address@hidden>:
> Steinar Bang writes:
>> > IIUC git's pull is not atomic. When the merge fails with a message like
>> > the above I have no idea in what state my copy of a repository is in.
>>
>> It is in the same state it was as before you did the pull.
> No, in the repo origin/master has been updated.
You're right. Sorry, I didn't read the statement closely enough.
> It's true that master has not been updated and the working tree is
> untouched.
Yes, that's what I meant.
> Of course this difference is probably not apparent to most users.
The important thing is that updating origin/master from upstream is an
absolutely safe thing to do, wrt. to the local changes (nothing is
overwritten, nothing is conflicted, no changes are lost).
- Re: VC mode and git, (continued)
- Re: VC mode and git, martin rudalics, 2015/04/06
- Re: VC mode and git, Eli Zaretskii, 2015/04/07
- Re: VC mode and git, martin rudalics, 2015/04/08
- Re: VC mode and git, Eli Zaretskii, 2015/04/08
- Re: VC mode and git, Steinar Bang, 2015/04/04
- Re: VC mode and git, Stephen J. Turnbull, 2015/04/04
- Re: VC mode and git,
Steinar Bang <=
- Re: VC mode and git, Stephen J. Turnbull, 2015/04/04
- Re: VC mode and git, Stephen J. Turnbull, 2015/04/04
- Re: VC mode and git, Eli Zaretskii, 2015/04/05
- Re: VC mode and git, Stephen J. Turnbull, 2015/04/05
- Re: VC mode and git, Eli Zaretskii, 2015/04/05
- Re: VC mode and git, Stephen J. Turnbull, 2015/04/05
- Re: VC mode and git, Eli Zaretskii, 2015/04/05
- Re: VC mode and git, Richard Stallman, 2015/04/05
- Re: VC mode and git, Eli Zaretskii, 2015/04/05
- Re: VC mode and git, Harald Hanche-Olsen, 2015/04/05