Describe the problem you’re having:
Trying to update via git pull, but git thinks something is changed in my local copy in the languages, but it isn’t. Even checking out the file again doesn’t fix it. I’m not a power-git user, but I’ve tried several things to no avail.
If possible include steps to reproduce the problem:
Try to update:
user@server:/path/tt-rss$ git pull
error: Your local changes to the following files would be overwritten by merge:
locale/pl_PL/LC_MESSAGES/messages.mo
Please commit your changes or stash them before you merge.
Aborting
Try to revert any possible changes to the affected file (there are none):
user@server:/path/tt-rss$ git checkout -- locale/pl_PL/LC_MESSAGES/messages.mo
Try to update again:
user@server:/path/tt-rss$ git pull
error: Your local changes to the following files would be overwritten by merge:
locale/pl_PL/LC_MESSAGES/messages.mo
Please commit your changes or stash them before you merge.
Aborting
tt-rss version (including git commit id):
Last successful commit pulled is 26a89ab6cb48e614a022aa65fefe62a8c9c71899
Platform (i.e. Linux distro, PHP, PostgreSQL, etc) versions:
Windows 2008 R2, PHP 5.6, MySQL 5.6
Please provide any additional information below:
Git pulls have worked flawlessly for years up to this point. I do all the git work from MacOS, mounting the volumes on my server.
(Edited for code formatting)
