Re: VC mode and git

[Eli Zaretskii]

> From: Steinar Bang <address@hidden>
> Date: Sat, 04 Apr 2015 18:09:58 +0200
> 
> >>>>> Eli Zaretskii <address@hidden>:
> 
> > I think it will succeed in fetching, and then refuse to merge.
> 
> Correct.
> 
> > But the way to handle this is the same as if the conflicted changes
> > are committed: fix the conflicts, and then "git pull" again.  Right?
> 
> No, that won't work: since the merge hasn't happened, there will be no
> conflicts, just the uncommitted changes.
> 
> The only way to make git do the merge is to move away the uncommitted
> changes, either by committing them, or by stashing them.

Right, so I amended the instructions by describing the commit
alternative.