Re: [Gretl-devel] git issue

On Wed, 21 Feb 2018, Artur T. wrote: > Dear all, > > I just wanted to compile a fresh version of gretl but I've obtained > the following error after "git pull" > > <error> > at@ati7:~/git/gretl-git$ git pull > Aktualisiere 53f234b8a..74367f589 > error: Ihre lokalen Änderungen in den folgenden Dateien würden durch > den Merge überschrieben werden: >     lib/src/geneval.c >     lib/src/gretl_foreign.c > Bitte committen oder stashen Sie Ihre Änderungen, bevor sie mergen. > Abbruch > </error> > > It's saying that the 2 listed files would be overwritten by the merge > command, and I should commit or stash my changes (I didn't do any!) > before merging. > > Any suggestions what to do? This is probably fall-out from recent flakiness at SF. I'd recommend doing: git checkout lib/src/geneval.c git checkout lib/src/gretl_foreign.c git pull Allin