![](https://img-blog.csdnimg.cn/20201014180756754.png?x-oss-process=image/resize,m_fixed,h_64,w_64)
关于git
老猫&咸鱼
无花果
展开
-
Git合并冲突(Merge made by the 'recursive' strategy.)
E:\phpStudy\WWW\vr>git branch -a dev master*hua remotes/origin/HEAD -> origin/master remotes/origin/dev remotes/origin/masterE:\phpStudy\WWW\vr>git statusOn branch huaChanges...原创 2018-06-15 10:51:56 · 55226 阅读 · 0 评论 -
git pull远程问题解决
git pull远程代码是,出现:Unlink of file '.git/objects/pack/pack-874309875iuytr.pack' failed. Should I try again? (y/n) yUnlink of file '.git/objects/pack/pack-874309875iuytr.pack' failed. Should I try ag...原创 2018-08-23 11:56:16 · 603 阅读 · 0 评论 -
Git清理远程已删除,本地还能看见的远程分支
#在每次对Git版本库进行代码推送的过程中,一定要思路清晰,要不就不要操作; #在Git操作中,‘删除’、‘清理’、‘分支’、‘远程’这类敏感词汇,请慎重操作; 对于很多使用Git的小伙伴来说,一不小心push一个新分支上去,可能大多数人在刚开始使用Git时,都有翻车的经历,下面是一个流程回顾:#git合并本地 git m...原创 2019-01-28 15:48:40 · 1988 阅读 · 0 评论