databasically // Kansas City Small Business IT && Ruby on Rails Programming » git http://databasically.com Kansas City Small Business IT Tue, 20 Jul 2010 21:35:03 +0000 http://wordpress.org/?v=2.9.2 en hourly 1 Capistrano deploy error "fatal: unable to create '.git/index.lock': File exists" http://databasically.com/2009/10/21/capistrano-deploy-error-fatal-unable-to-create-gitindex-lock-file-exists/ http://databasically.com/2009/10/21/capistrano-deploy-error-fatal-unable-to-create-gitindex-lock-file-exists/#comments Wed, 21 Oct 2009 15:54:35 +0000 Wes http://www.databasically.com/?p=132 This isn’t specific to capistrano, necessarily, but I ran into it deploying.

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

The fix:
Got to your project’s shared/cached-copy/.git folder and delete index.lock . It shouldn’t ever get hung up like that, but it happened to me.

]]> http://databasically.com/2009/10/21/capistrano-deploy-error-fatal-unable-to-create-gitindex-lock-file-exists/feed/ 0 git: You asked me to pull without telling me which branch … http://databasically.com/2009/07/01/git-you-asked-me-to-pull-without-telling-me-which-branch/ http://databasically.com/2009/07/01/git-you-asked-me-to-pull-without-telling-me-which-branch/#comments Thu, 02 Jul 2009 02:17:44 +0000 Wes http://www.databasically.com/?p=129 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.


To fix, I added this to .git/config:

]]> http://databasically.com/2009/07/01/git-you-asked-me-to-pull-without-telling-me-which-branch/feed/ 0 git: failed to push some refs http://databasically.com/2009/06/26/git-failed-to-push-some-refs/ http://databasically.com/2009/06/26/git-failed-to-push-some-refs/#comments Fri, 26 Jun 2009 19:23:25 +0000 Wes http://www.databasically.com/?p=126 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?)”

]]> http://databasically.com/2009/06/26/git-failed-to-push-some-refs/feed/ 0