On Wed, 15 Feb 2017, Artur T. wrote:
Dear all,
for some reason I obtain the following issue with git when trying to
update to the latest version using gut:
<gitout>
at@ATLaptop:~$ cd gretl-git && git pull && ./configure --enable-openmp
--enable-build-doc && make clean && make -j4 && make pdfdocs
&& sudo
make install
remote: Counting objects: 111, done.
remote: Compressing objects: 100% (78/78), done.
remote: Total 78 (delta 59), reused 0 (delta 0)
Entpacke Objekte: 100% (78/78), Fertig.
Von
git://git.code.sf.net/p/gretl/git
f6ce406..7be8ed6 master -> origin/master
Aktualisiere a331d61..7be8ed6
error: Your local changes to the following files would be overwritten by
merge:
po/bg.po
Please commit your changes or stash them before you merge.
</gitout>
I have no idea why git thinks that I have changed anything locally which
I haven't...
Don't know why that should be, but you can fix it with
git checkout po/bg.po
Allin