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: DETAIL: User was holding a relation lock for too long.
! [remote rejected] release_3 -> release_3 (pre-receive hook declined)
error: failed to push some refs to 'firstname.lastname@example.org:xxx/xxx.git'
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 email@example.com: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.
As a project manager, I have discovered that different developers want to bring their previous branching method with them when they join the team. Some developers are used to performing individual wo...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs