Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.Sign up
update doesn't work #1070
When I type Y to update oh-my-zsh, I get this error message:
Last login: Sun Apr 15 15:22:10 on ttys000
I'm using an iMac (osx lion 10.7.3), and I have git version 184.108.40.206 installed.
My .zshrc file is as follows:
PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm"
when I try to update I'm getting:
I tried git reset --hard , git merge --abort, git reset --merge
You have corrupted your local git tree somehow, and this is not OMZ's fault.
Maybe you can try to commit and see what happens? If