Re: VC mode and git

[Eli Zaretskii]

> From: "Stephen J. Turnbull" <address@hidden>
> Cc: Steinar Bang <address@hidden>,
>     address@hidden
> Date: Fri, 03 Apr 2015 17:16:30 +0900
> 
>  > 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
> 
> I guess this procedure will create a commit without any of the most
> recently pulled content.  He will need to do the merge again, which
> may result in more conflicts.

If that's true (and I'm not sure it is), then the procedure after
resolving conflicts is simply

  git pull
  git push