root@tv:/usr/local/sickbeard# git reset --hard
HEAD is now at 33921ec Merge branch 'develop'
root@tv:/usr/local/sickbeard# git pull
Updating 33921ec..e28f73f
error: Your local changes to the following files would be overwritten by merge:
        .gitignore
        gui/slick/interfaces/default/displayShow.tmpl
        gui/slick/interfaces/default/viewlogs.tmpl
        lib/subliminal/videos.py
        sickbeard/postProcessor.py
Please, commit your changes or stash them before you can merge.
Aborting