Re: VC mode and git

[Eli Zaretskii]

> Date: Fri, 03 Apr 2015 10:34:23 +0200
> From: Harald Hanche-Olsen <address@hidden>
> CC: Steinar Bang <address@hidden>, address@hidden
> 
> 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.

Yes, I think so too.  But then they are already in the index, and "git
commit" after resolving the conflicts should finish the merge by
creating a merge-commit with all the changes that were pulled in all
those files.

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

Yes, that's always a Good Thing.