Re: VC mode and git

[Harald Hanche-Olsen]

Eli Zaretskii wrote:
> > Date: Sun, 05 Apr 2015 05:10:59 -0400
> > From: Richard Stallman<address@hidden>
> > Cc: address@hidden, address@hidden

Note: I had not seen this mail from Richard when I responded to his 
other one. It does change things a bit.

> It looks like you've stashed all the changes upstream that the failed
> pull brought in, but failed to merge due to your local changes (in
> lisp/ChangeLog) that conflicted with the changes upstream.
>
> > Now I am concerned that when I pull again, it will reinstall all of this.
>
> I suggest to unstash them, fix the conflict in lisp/ChangeLog, and
> then commit all of that.  Then you should be in sync with upstream and
> can pull again.

Yes. At risk of repeating myself: After committing, run

git diff origin/master

which should give you exactly the changes you have written, no more, no 
less. Don't push unless the output looks sane.

– Harald