今天遇到一个问题,跟大家分享一下。
1.
$ git pull origin version_one
From https://*********/****/****
* branch version_one -> FETCH_HEAD
error: cannot lock ref 'refs/remotes/origin/version_one': unable to resolve reference 'refs/remotes/origin/version_one': reference broken
! [new branch] version_one -> origin/version_one (unable to update local ref)
在我自信满满敲出代码时,却出现了这么一个问题,看错误是分支文件损坏,很纠结。
2.
$ git branch -vv
develop 3d36ae6 Merge branch 'develop' of http://*****/***/*****
master 43002dd init project
* version_one bf8d383 Merge branch 'version_one_ls' into version_one
version_one_ls 9d13e95 [origin/version_one_ls] 1.crm js删除多余代码
version_one分支chuxian出现问题
3.
$ git branch -rv
warning: ignoring broken ref refs/remotes/origin/version_one
origin/admin_tab 3774601 add hui
origin/develop d3d73d9 Merge remote-tracking branch 'origin/develop' into version_one
origin/master c228126 Merge branch 'zyfix' - 解决编辑订单用户信息显示不正确的问题,多条用户记录相同手机号的情况下没有正确显示用户信息
origin/version_chq c6bc6cf Merge remote-tracking branch 'origin/version_one' into version_chq
origin/version_one_chenc fc2bfea 合并version_one解决冲突
origin/version_one_chq 3d59e11 register_source
origin/version_one_decode a8dce81 解决编辑用户bug2
origin/version_one_ls 9d13e95 1.crm js删除多余代码
origin/version_one_whj 2e29bad 三证查验功能优化
origin/version_one_zgz 68aebba Merge branch 'version_one' of http://gitlab.chemanman.com/yanrui/twpt into version_one
origin/version_one_zy 798609c 催缴部分
提示warning,接下来删除错误
4.
$ rm .git/refs/remotes/origin/version_one
删除出错文件
5.
$ git fetch origin
From https://**************/******/******
* [new branch] version_one -> origin/version_one
重新拉取,
6.
$ git checkout -b version_one origin/version_one
Branch version_one set up to track remote branch version_one from origin.
Switched to a new branch 'version_one'
重新创建并切换分支
7.
$ git branch -vv
develop 3d36ae6 Merge branch 'develop' of http://****************/***/***** into develop
master 43002dd init project
* version_one 2861f9d [origin/version_one] Merge branch 'version_one' of https://**********/******/*****into version_one
version_one_ls 9d13e95 [origin/version_one_ls] 1.crm js删除多余代码
问题解决。