git remote prune origin 删除本地有但在远程库已经不存在的分支

问题1：

解决git 出现 Your account has been blocked问题

使用git 出现 Your account has been blocked

无法从远程pull代码下来

解决：

$ git push origin master

问题2：

GitLab: Your account has been blocked.

fatal: Could not read from remote repository.:

git 提交时出现以上问题

解决：

$ git remote set-url origin git@git.58haha.com:web/58haha.git

问题3：

error: unable to resolve reference refs/remotes/origin/yst/downline: Not a directory

From git.58haha.com:web/58haha

! [new branch]      58haha/downline -> origin/58haha/downline  (unable toupdatelocalref)

error: somelocal refs could not be updated; try running

'git remote prune origin' to remove any old, conflicting branches

解决：

$ git remote prune origin

问题4：

git stash pop后出现冲突

git stash pop后,如果出现冲突的话,不会被drop掉,修改还在

解决：

$ git reset--hard HEAD