Can't update

[chrisryburn]

Hi, I have a Raspberry Pi 2. Connected to a USB drive and USB DAC. Everything works fine, however, when I log into the Pi from my macbook using SSH to use these commends to update:
cd /var/www
git pull
curl -s -X GET 'http://localhost/clear'
this is the result:
Last login: Sat Jul 16 04:39:55 2016 from 192.168.0.10
[root@runeaudio ~]# ls
[root@runeaudio ~]# cd /var/www
[root@runeaudio www]# 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
[root@runeaudio www]# curl -s -X GET 'http://localhost/clear' .

I am no expert, but hoping one can advise me how to progress?
Thanks in anticipation

[hondagx35]

[chrisryburn]

Hi Frank,

Results as below:
Last login: Sat Jul 16 22:18:27 on ttys000
MacBook-Air:~ chrisruthryburn$ cd /var/www
-bash: cd: /var/www: No such file or directory
MacBook-Air:~ chrisruthryburn$ git stash
xcrun: error: invalid active developer path (/Library/Developer/CommandLineTools), missing xcrun at: /Library/Developer/CommandLineTools/usr/bin/xcrun
MacBook-Air:~ chrisruthryburn$ git pull
xcrun: error: invalid active developer path (/Library/Developer/CommandLineTools), missing xcrun at: /Library/Developer/CommandLineTools/usr/bin/xcrun
MacBook-Air:~ chrisruthryburn$

Chris

[hondagx35]

[chrisryburn]

Hi Frank,
Oops thats pretty stupid on my part...Sorry about that - comes from trying to run your solution late at night when I'm tired...
Hope I'm running it right now. Results now are:
Last login: Sat Jul 16 22:19:16 2016 from 192.168.0.11
[root@runeaudio ~]# cd /var/www
[root@runeaudio www]# git stash
No local changes to save
[root@runeaudio www]# 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
[root@runeaudio www]#

[hondagx35]

[chrisryburn]

Thanks Frank, appears we have success, appreciate your help!

[root@runeaudio ~]# cd /var/www
[root@runeaudio www]# rm command/mpd-watchdog
[root@runeaudio www]# git pull
Updating 71f5236..e6f6474
Fast-forward
app/libs/runeaudio.php | 23 ++++++++--
app/lyric_ctl.php | 16 +++++++
app/mpd_ctl.php | 1 +
app/settings_ctl.php | 1 +
app/templates/footer.php | 8 +++-
app/templates/header.php | 2 +-
app/templates/mpd.php | 17 +++++--
app/templates/settings.php | 36 +++++++++++++++
assets/js/runeui.js | 93 ++++++++++++++++++++++++++++++-------
assets/js/runeui.min.js | 4 +-
command/debug_collector | 4 ++
command/lyric.sh | 12 +++++
command/mpd-watchdog | 111 +++++++++++++++++++++++++++++++++++++++++++++
command/orion_optimize.sh | 74 +++++++++++++++++++++++-------
command/rune_SY_wrk | 19 ++++++--
command/rune_shutdown | 7 +++
db/redis_acards_details | 2 +
index.php | 1 +
18 files changed, 382 insertions(+), 49 deletions(-)
create mode 100755 app/lyric_ctl.php
create mode 100755 command/lyric.sh
create mode 100644 command/mpd-watchdog
[root@runeaudio www]#

Kind regards

Chris

[dunghnguyen]