DETAIL: User was holding a relation lock for too long.

runner_mei

d:\developing\go\meijing\src\cn\com\hengwei>git push
Counting objects: 6, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (6/6), done.
Writing objects: 100% (6/6), 591 bytes | 0 bytes/s, done.
Total 6 (delta 5), reused 0 (delta 0)
remote: canceling statement due to conflict with recovery
remote: LINE 1: ...er"."date_joined" FROM "bb_repository" INNER JOIN "auth_user.
..
remote:                                                              ^
remote: DETAIL:  User was holding a relation lock for too long.
remote:
To git@bitbucket.org:xxx/xxx.git
 ! [remote rejected] release_3 -> release_3 (pre-receive hook declined)
error: failed to push some refs to 'git@bitbucket.org:xxx/xxx.git'

cfreas

I was able to fix this by cloning my repository to a different location, copying my changed files from the "bad" repo to the new clone, then doing the commit and push normally. So something like:

 

git clone git@bitbucket.org:xxx/xxx.git ~/temp_location

cp -r ~/bad_repo/* ~/temp_location

cd ~/temp_location

git add .; git commit -m "yay!"; git push -u origin master

 

Hope that helps.