Re: VC mode and git

[Harald Hanche-Olsen]

Eli Zaretskii wrote:
> The situation is that a pull was done and failed because of
> conflicting local commits.  The merge part of the pull in this case is
> already aborted.

But if so, where are all the modified files in the index coming from? My 
hypothesis is that they come from the merge. More precisely, I expect 
they are exact copies from origin/master.

> All Richard needs to do is resolve the conflicts one
> by one (AFAIU, he only had one to begin with, in a ChangeLog file),
> and then do:
>
>    git commit
>    git push

Agreed, though I don't think he should push without doing a sanity check 
first. Basically, “git diff origin/master” to check that he is merely 
committing his own changes. (I *think* that will be so, but I don't 
*know* it.) Also, he will need to do another git pull, possibly followed 
by resolving more conflicts, before being able to push.

> So why would Richard need to use "stash" in this situation?  It sounds
> like an unnecessary complication.  Am I missing something?

No need for a stash. If the result of fixing the ChangeLog and 
committing is not what is desired, that can be fixed later. There is no 
possible information loss from the proposed course of action, apart from 
in lisp/ChangeLog, and that shouldn't be hard to remedy.

– Harald