You are not currently on a branch. Please specify which branch you want to merge with.

刺骨的言语ヽ痛彻心扉 2022-03-29 09:37 1740阅读 0赞

*前言 " class="reference-link">
*前言

   前两天在使用Git提交代码时,我本地显示没什么可提交的了,但其他同事那却看不到我的代码提交记录,于是我就在自己本地再次尝试pull,看能更新下来他们的代码嘛,结果提示我merge,当时也没仔细看merge啥,以往merge那个文件是可以点开的,这次也没有,我再次pull时,pull和push的按钮都变成了灰色,我用命令pull时就提示“You are not currently on a branch. Please specify which branch you want to merge with”,然后百度了一下,其实是我此时本地代码的版本已经不在master主分支上了。如何解决此问题呢,详情请见下文!

*问题 " class="reference-link">
*问题

  1. remote: Counting objects: 159, done.
  2. remote: Total 159 (delta 12), reused 115 (delta 12)
  3. Receiving objects: 100% (159/159), 83.11 KiB | 842.00 KiB/s, done.
  4. Resolving deltas: 100% (12/12), done.
  5. From code.aliyun.com:lidabsky/nsbd
  6. a238209b..29844093 dev -> origin/dev
  7. You are not currently on a branch.
  8. Please specify which branch you want to merge with.
  9. See git-pull(1) for details.
  10. git pull <remote> <branch>

*解决 " class="reference-link">
*解决

  1. #1、查看所有变化的文件,把有改动的先删除。
  2. git status
  3. #2、切回master主分支
  4. git checkout master
  5. #3、更新最新的代码
  6. git pull
  7. #4、切回之前使用的dev分支
  8. git checkout dev

参考文章:git错误You are not currently on a branch

发表评论

表情:
评论列表 (有 0 条评论,1740人围观)

还没有评论,来说两句吧...

相关阅读