Re: Emacs VC issue

[Eli Zaretskii]

> From: Live System User <address@hidden>
> Date: Mon, 17 Dec 2018 03:01:48 -0500
> 
>         I am currently experiencing an issue with the Emacs
>         master repo and "vc-update".
> 
>         When I go to "pull", I get the following error:
> 
> 
> Running "git pull --stat"...
> >From git://git.sv.gnu.org/emacs
>    3edddba..61dbe6b  master     -> origin/master
> error: Your local changes to the following files would be overwritten by 
> merge:
>       src/macuvs.h
> Please, commit your changes or stash them before you can merge.
> Aborting
> Updating 8c28ac8..61dbe6b
> 
> 
> 
>         Since I did not make any "local changes" (I only do
>       pull and "make"), I suspect that something happened
>         on the remote's end.

Nothing happened.  But in any such case, when you see a message like
that and know for sure you didn't change the offending file, the
remedy is simple:

  git checkout src/macuvs.h
  git pull