Re: VC mode and git

[Steinar Bang]

>>>>> "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).