45825ae 112 min ago Mike fix bug master(Blue's conflicted copy 2012-11-30)
1ba982c 2 hours ago Mike update doc
3fbc637 4 hours ago Mike fix ui bug master
193b99e 5 hours ago Mike fix model bug
Above is a shortlog of my git repo. Running git status from my project shows:
# On branch master
# Your branch is ahead of 'origin/master' by 1 commit.
#
nothing to commit (working directory clean)
If i run push, it will give me:
http://localhost/myproject.git: push not permitted
Any ideas?
EDIT: When I try to clone my project again, it gives me:
fatal: Reference has invalid format: 'refs/heas/master(Blue's conflicted copy 2012-11:30)'