[ thumper: corengine ] % git-reset  --hard
HEAD is now at 163bcff... Merge branch 'master' of git@git.kgpn:corengine_server/mainline
[ thumper: corengine ] % git-reset  --hard HEAD
HEAD is now at 163bcff... Merge branch 'master' of git@git.kgpn:corengine_server/mainline
[ thumper: corengine ] % git merge new_authorization
Updating 163bcff..3615115
fatal: Entry 'app/views/internal_users/_form.html.haml' not uptodate. Cannot merge.
[ thumper: corengine ] % git status
# On branch master
nothing to commit (working directory clean)
[ thumper: corengine ] %