Error updating to the nightly build.

[PanicFan]

i followed these directions:

1. go to the dev section of the UI, typing http://runeaudio/dev or http://runeaudio.local/dev in your browser
2. set the Dev Mode to enabled
3. click the gitpull button (Update RuneUI)
4. hard refresh the cache of your browser (howto)




And i get this error:
RuneUI updated successfully
error: Your local changes to the following files would be overwritten by merge:
app/config/_os/usr/lib/systemd/system/shairport.service
app/config/defaults/shairport.service
app/coverart_ctl.php
app/libs/runeaudio.php
app/network_ctl.php
command/airplay_toggle
command/rune_PL_wrk
Please, commit your changes or stash them before you can merge.
Aborting
Updating 077e21a..35c5cba


Am i just out of luck until a newer version comes out?

[hondagx35]

[PanicFan]

THANK YOU!!!!!!!!


I feel smarter than i am now!!! That fixed everything. I updated Rune to the nightly build following those instructions. I used Putty to ssh into Rune applied the commands that you gave me, rebooted the Pi2 (only way i know how is to unplug it - wait 5 seconds - and plug it back in) and BAM!

Dirble is working again!!!

Thank you so much for the help and the Great product!

Cheers!

[BayleeWylie]