[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: VC mode and git

From: Stephen J. Turnbull
Subject: Re: VC mode and git
Date: Sun, 05 Apr 2015 08:17:29 +0900

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.  It's true that master
has not been updated and the working tree is untouched.  Of course
this difference is probably not apparent to most users.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]