I've got the same issue with Dirble.
I tried to gitpull and got this message
Update RuneUI
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
app/templates/network_wlan.php
app/templates/playback.php
app/templates/settings.php
assets/js/runeui.js
command/airplay_toggle
command/rune_PL_wrk
db/index.php
Please, commit your changes or stash them before you can merge.
Aborting
Updating 077e21a..248e6cc
I assume that there is something I need to do to make the merge work
other than going to the different screens and saving?