#3 update not working - git out of sync

pi@zpc-ct-01:~/zpc_ct $ git pull
remote: Enumerating objects: 20, done.
remote: Counting objects: 100% (20/20), done.
remote: Compressing objects: 100% (12/12), done.
remote: Total 12 (delta 7), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (12/12), done.
From http://gogs.shuvit.org:3000/shuvit/zpc_ct
   aafbb5a..2169b0d  master      -> origin/master
 * [new branch]      hiddenfiles -> origin/hiddenfiles
Updating aafbb5a..2169b0d
error: Your local changes to the following files would be overwritten by merge:
	user/songs/default.sng
Please commit your changes or stash them before you merge.
Aborting

hard reset and then pull should do it. unless there are untracked file conflicts

pi@zpc-ct-01:~/zpc_ct $ git reset --hard
HEAD is now at aafbb5a bb
pi@zpc-ct-01:~/zpc_ct $ git pull
Updating aafbb5a..2169b0d
Fast-forward
 .gitignore             |  1 +
 lib/sLoadSound.py      |  3 +--
 lib/utils.py           | 19 +++++++++++--------
 user/songs/default.sng | 10 +++++-----
 4 files changed, 18 insertions(+), 15 deletions(-)