:(

gistfile1.txt

~/Desktop/lixp$ git pull
remote: Counting objects: 385, done.
remote: Compressing objects: 100% (367/367), done.
remote: Total 372 (delta 243), reused 0 (delta 0)
Receiving objects: 100% (372/372), 772.02 KiB | 625 KiB/s, done.
Resolving deltas: 100% (243/243), completed with 9 local objects.
From http://github.com/programble/lixp
   195eba8..a3d4b02  master     -> origin/master
From http://github.com/programble/lixp
 * [new tag]         v0.0.1     -> v0.0.1
Updating 195eba8..a3d4b02
error: Your local changes to 'Makefile' would be overwritten by merge.  Aborting.
Please, commit your changes or stash them before you can merge.
~/Desktop/lixp$ git reset --hard HEAD
HEAD is now at 195eba8 I hate you.
~/Desktop/lixp$ :(
bash: syntax error near unexpected token `newline'