error pulling

[tooth pik]

is anyone else getting this:

Updating 7d0abf2cb..7e4f62a25
error: Your local changes to the following files would be overwritten by merge:
        src/po/ru.cp1251.po
Please commit your local changes or stash them before you merge.
Aborting

[Ernie Rael]

On 23/12/28 3:48 PM, tooth pik wrote:

is anyone else getting this:

I don't use github, but in mercurial I frequently get "modified" status for a file in src/po after some combo of pull/build/update. I revert the file to get rid of the change. Not sure what causes it, build/makefile?

-ernie

Updating 7d0abf2cb..7e4f62a25
error: Your local changes to the following files would be overwritten by merge:
        src/po/ru.cp1251.po
Please commit your local changes or stash them before you merge.
Aborting

--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

---
You received this message because you are subscribed to the Google Groups "vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email to vim_dev+u...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/vim_dev/CALfSX1xEnVco0KxsKu443pGv0OqefyPC%3DsuvDQUjdqZTRsCphw%40mail.gmail.com.

[tooth pik]

i did a "git reset --hard" and all is working normally now

sorry for the noise

To view this discussion on the web visit https://groups.google.com/d/msgid/vim_dev/b8e1d615-78db-4095-95af-6589dcf47f4f%40raelity.com.

[Christian Brabandt]

On Do, 28 Dez 2023, Ernie Rael wrote:

> On 23/12/28 3:48 PM, tooth pik wrote:
> > is anyone else getting this:
>
> I don't use github, but in mercurial I frequently get "modified" status for
> a file in src/po after some combo of pull/build/update. I revert the file to
> get rid of the change. Not sure what causes it, build/makefile?

I noticed that same, it usually happens after I merge/update russian
translations. I don't know why and after a git reset --hard it goes away
until next time....

Thanks,
Christian
--
To invent, you need a good imagination and a pile of junk.
-- Thomas Edison

[Antonio Giovanni Colombo]

Hi,

It happens to me from time to time, for other files (usually it.po).

As far as I can tell, it means that the file has been (inadvertently) modified.

To play it safe, I just clone the whole Vim distribution (removing the current one), to be sure that all files are as they should be from the Vim distribution.

Hope it helps, Antonio