git 常见错误

一、git push 本地分支与远程分支关联

1. ​​基于当前分支创建本地分支，且切换到该分支​​

git checkout -b dev

1. ​​将本地分支push 到远程分支​​

git push origin dev

1. ​​拉取代码 git pull 报如下错​​
   报错提示中已说明如何解决： ​​git branch --set-upstream-to=origin/<branch> dev​​，即将本地分支与远程分支关联起来

git branch --set-upstream-to=origin/dev

再拉取代码，已正常

1. ​​也可以在push时，加上​​–set-upstream​​直接关联，一步到位​​

git push --set-upstream origin dev

二、git push 提示 ! [rejected] dev -> dev (non-fast-forward)

错误原因是代码冲突，有文件你改了，你同事也改了，哎，这时缘分来啦。报了错误
push代码时， 提示​​​! [rejected] dev -> dev (non-fast-forward)​​， pull了远程代码重新提交，还是同样的提示

git fetch origin dev //获取远程dev分支的修改
git merge origin dev // 合并远程dev分支
git pull origin dev // 更新本地的代码

三、error: cannot lock ref ‘refs/remotes/origin/xxx’: unable to resolve reference refs/remotes/origin/xxx: Invalid argument

git pull origin dev_small
From http://git.samll.com/git/dev_small

branch okex_zhangjunbo -> FETCH_HEAD
error: cannot lock ref ‘refs/remotes/origin/dev_small’: unable to resolve reference ‘refs/remotes/origin/dev_small’: reference broken
! [new branch] dev_small-> origin/dev_small(unable to update local ref)

解决办法

rm .git/refs/remotes/origin/xxx