knife cookbook site install fails
I assume due to very old, previously installed vendor branches. Do the following:
Cancel the merge the failed command put you into:
git reset --hard HEAD
Delete the problematic vendor branch:
git branch -D chef-vendor-
ATTENTION make sure you did not modify the vendor branch yourself - you'll lose those changes!!!