I don't know what happened but for some reason when I try to use github again I get this error saying that I'm trying to merge something. I completely want to undo the whole thing:
Found a swap file by the name ".git/.MERGE_MSG.swp"
owned by: mauriciosanchezduque dated: Tue May 21 22:18:59 2013
file name: ~mauriciosanchezduque/.git/MERGE_MSG
user name: mauriciosanchezduque host name: Mauricios-MacBook-Pro.local
process ID: 4738
While opening file ".git/MERGE_MSG"
dated: Tue May 21 22:27:11 2013
NEWER than swap file!
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
no changes added to commit (use "git add" and/or "git commit -a")
To abort screwed up merge, you need to use rather unintuitive
git reset --merge
Most other commands like
git am use
--abort switch for this which is much easier to remember. But,
git merge somehow does not support