Capistrano deploy error "fatal: unable to create '.git/index.lock': File exists"

Posted by Wes in Ruby on Rails, Version Control      No comments

Oct
21

This isn’t specific to capistrano, necessarily, but I ran into it deploying.

fatal: unable to create '.git/index.lock': File exists
read more

git: You asked me to pull without telling me which branch …

Posted by Wes in Version Control      No comments

Jul
1

Received this error when trying to pull from a remote origin:

You asked me to pull without telling me which branch you
want to merge with, and 'branch.master.merge' in
your configuration file does not tell me either.

read more

git: failed to push some refs

Posted by Wes in Programming, Version Control      No comments

Jun
26

I’m really digging git, but its error messages are less than helpful at times.

git push origin master
error: failed to push some refs to origin

Most likely, there are changes in the remote repo that you need to pull first:

git pull origin master

Resolve any conflicts, then you can push to the remote git repo.

I’m not sure why “failed to push some refs” couldn’t include “(do you need to pull?)”