[solved] git pull not possible

[sykodad]

I just flashed a sd card with the latest RPi2-image. Unfortunately, I cannot update the system with "git pull":

[root@runeaudio http]# git pull
Updating 71f5236..e6f6474
error: The following untracked working tree files would be overwritten by merge:
command/mpd-watchdog
Please move or remove them before you can merge.
Aborting

Regards,

Jan

[hondagx35]

Hi Jan,

please try:

Code: Select all

cd /var/www
rm command/mpd-watchdog
git pull

Frank

[sykodad]

Hello Frank,

great, that did the trick. Thank you.


Regards,

Jan

[waves]

please try:

Code: Select all

cd /var/www
rm command/mpd-watchdog
git pull

Hi Frank. What does the "rm command/mpd-watchdog" disable? Is that something that is useful to enable after the git pull has finished and if so how do we reenable it?

[hondagx35]

Hi waves,

What does the "rm command/mpd-watchdog" disable?

Nothing!
Git is a very nice tool, but sometimes a bit like a diva.
I have forgotten to sync the image with git before releasing it.
Git wants to add the file but it is already there.
The command "rm" stands for remove or delete.

"mpd-watchdog" monitors mpd and tries to restart playback when it appears to hang.
This can be especially useful when playing internet streams (webradio).
The service is enabled by default, so nothing to do.

Frank

[BorGreiner]

Um... Did I break something?

[root@delovna www]# git pull
fatal: unable to access 'https://github.com/RuneAudio/RuneUI.git/': SSL certificate problem: certificate is not yet valid

[AxelFendersson]

Could be that the date/time isn't set correctly on your device. Try running

Code: Select all

date

and checking that it's correct.

[BorGreiner]

date --set="17 November 2016 08:36:00"

before doing git pull, solved the issue, many thanks!