Did you intend to checkout 'origin/remote-name' which can not be resolved as commit?

问题:

Did you intend to checkout 'origin/remote-name' which can not be resolved as commit?

解决:

完整例子:

# NOTE:同步tag


$ git pull tornado v4.5.1
remote: Counting objects: 1, done.
remote: Total 1 (delta 0), reused 0 (delta 0), pack-reused 1
Unpacking objects: 100% (1/1), done.
From github.com:tornadoweb/tornado
 * tag               v4.5.1     -> FETCH_HEAD
Already up-to-date.
$ git checkout -b v4.5.1 tornado/v4.5.1
fatal: Cannot update paths and switch to branch 'v4.5.1' at the same time.
Did you intend to checkout 'tornado/v4.5.1' which can not be resolved as commit?
$ ls
LICENSE      MANIFEST.in  README.rst   appveyor.yml codecov.yml  demos        docs         maint        runtests.sh  setup.py     tornado      tox.ini
$ git status
On branch stable
Your branch is up-to-date with 'tornado/stable'.
nothing to commit, working directory clean
$ git branch -a
  branch4.3
  branch4.5
  master
* stable
  remotes/origin/HEAD -> origin/master
  remotes/origin/branch1.2
  remotes/origin/branch2.0
  remotes/origin/branch2.1
  remotes/origin/branch4.3
  remotes/origin/branch4.5
  remotes/origin/master
  remotes/origin/stable
  remotes/tornado/branch4.3
  remotes/tornado/branch4.5
  remotes/tornado/master
  remotes/tornado/stable

$ git tag
v1.0.0
v1.0.1
v1.1.0
v1.1.1
v1.2.0
v1.2.1
v2.0.0
v2.1.0
v2.1.1

$ git remote show origin
* remote origin
  Fetch URL: git@github.com:jiaxiaolei/tornado.git
  Push  URL: git@github.com:jiaxiaolei/tornado.git
  HEAD branch: master
  Remote branches:
    branch1.2 tracked
    branch2.0 tracked
    branch2.1 tracked
    branch4.3 tracked
    branch4.5 tracked
    master    tracked
    stable    tracked
  Local branch configured for 'git pull':
    master merges with remote master
  Local refs configured for 'git push':
    branch4.3 pushes to branch4.3 (fast-forwardable)
    branch4.5 pushes to branch4.5 (up to date)
    master    pushes to master    (up to date)
    stable    pushes to stable    (up to date)

$ git remote update
Fetching origin
Fetching tornado
remote: Counting objects: 106, done.
remote: Total 106 (delta 42), reused 42 (delta 42), pack-reused 64
Receiving objects: 100% (106/106), 64.45 KiB | 86.00 KiB/s, done.
Resolving deltas: 100% (47/47), completed with 29 local objects.
From github.com:tornadoweb/tornado
 * [new branch]      branch1.2  -> tornado/branch1.2
 * [new branch]      branch2.0  -> tornado/branch2.0
 * [new branch]      branch2.1  -> tornado/branch2.1
 * [new branch]      branch2.2  -> tornado/branch2.2
 * [new branch]      branch2.3  -> tornado/branch2.3
 * [new branch]      branch2.4  -> tornado/branch2.4
 * [new branch]      branch3.0  -> tornado/branch3.0
 * [new branch]      branch3.1  -> tornado/branch3.1
 * [new branch]      branch3.2  -> tornado/branch3.2
 * [new branch]      branch4.0  -> tornado/branch4.0
 * [new branch]      branch4.1  -> tornado/branch4.1
 * [new branch]      branch4.2  -> tornado/branch4.2
 * [new branch]      branch4.4  -> tornado/branch4.4
 * [new branch]      gh-pages   -> tornado/gh-pages
 * [new tag]         v2.2.0     -> v2.2.0
 * [new tag]         v2.2.1     -> v2.2.1
 * [new tag]         v2.3.0     -> v2.3.0
 * [new tag]         v2.4.0     -> v2.4.0
 * [new tag]         v2.4.1     -> v2.4.1
 * [new tag]         v3.0.0     -> v3.0.0
 * [new tag]         v3.0.1     -> v3.0.1
 * [new tag]         v3.0.2     -> v3.0.2
 * [new tag]         v3.1.0     -> v3.1.0
 * [new tag]         v3.1.1     -> v3.1.1
 * [new tag]         v3.2.0     -> v3.2.0
 * [new tag]         v3.2.0b1   -> v3.2.0b1
 * [new tag]         v3.2.0b2   -> v3.2.0b2
 * [new tag]         v3.2.1     -> v3.2.1
 * [new tag]         v3.2.2     -> v3.2.2
 * [new tag]         v4.0.0     -> v4.0.0
 * [new tag]         v4.0.0b1   -> v4.0.0b1
 * [new tag]         v4.0.0b2   -> v4.0.0b2
 * [new tag]         v4.0.0b3   -> v4.0.0b3
 * [new tag]         v4.0.1     -> v4.0.1
 * [new tag]         v4.0.2     -> v4.0.2
 * [new tag]         v4.1.0     -> v4.1.0
 * [new tag]         v4.1.0b1   -> v4.1.0b1
 * [new tag]         v4.1.0b2   -> v4.1.0b2
 * [new tag]         v4.2.0     -> v4.2.0
 * [new tag]         v4.2.0b1   -> v4.2.0b1
 * [new tag]         v4.2.1     -> v4.2.1
 * [new tag]         v4.3.0     -> v4.3.0
 * [new tag]         v4.3.0b1   -> v4.3.0b1
 * [new tag]         v4.3.0b2   -> v4.3.0b2
 * [new tag]         v4.4.0     -> v4.4.0
 * [new tag]         v4.4.0b1   -> v4.4.0b1
 * [new tag]         v4.4.1     -> v4.4.1
 * [new tag]         v4.4.2     -> v4.4.2
 * [new tag]         v4.4.3     -> v4.4.3
 * [new tag]         v4.5.0     -> v4.5.0
 * [new tag]         v4.5.1     -> v4.5.1

$ git fetch

# NOTE:  本地所有tag push 到origin 
$ git push origin --tags
Counting objects: 26, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (26/26), done.
Writing objects: 100% (26/26), 46.08 KiB | 0 bytes/s, done.
Total 26 (delta 0), reused 26 (delta 0)
To git@github.com:jiaxiaolei/tornado.git
 * [new tag]         v2.2.0 -> v2.2.0
 * [new tag]         v2.2.1 -> v2.2.1
 * [new tag]         v2.3.0 -> v2.3.0
 * [new tag]         v2.4.0 -> v2.4.0
 * [new tag]         v2.4.1 -> v2.4.1
 * [new tag]         v3.0.0 -> v3.0.0
 * [new tag]         v3.0.1 -> v3.0.1
 * [new tag]         v3.0.2 -> v3.0.2
 * [new tag]         v3.1.0 -> v3.1.0
 * [new tag]         v3.1.1 -> v3.1.1
 * [new tag]         v3.2.0 -> v3.2.0
 * [new tag]         v3.2.0b1 -> v3.2.0b1
 * [new tag]         v3.2.0b2 -> v3.2.0b2
 * [new tag]         v3.2.1 -> v3.2.1
 * [new tag]         v3.2.2 -> v3.2.2
 * [new tag]         v4.0.0 -> v4.0.0
 * [new tag]         v4.0.0b1 -> v4.0.0b1
 * [new tag]         v4.0.0b2 -> v4.0.0b2
 * [new tag]         v4.0.0b3 -> v4.0.0b3
 * [new tag]         v4.0.1 -> v4.0.1
 * [new tag]         v4.0.2 -> v4.0.2
 * [new tag]         v4.1.0 -> v4.1.0
 * [new tag]         v4.1.0b1 -> v4.1.0b1
 * [new tag]         v4.1.0b2 -> v4.1.0b2
 * [new tag]         v4.2.0 -> v4.2.0
 * [new tag]         v4.2.0b1 -> v4.2.0b1
 * [new tag]         v4.2.1 -> v4.2.1
 * [new tag]         v4.3.0 -> v4.3.0
 * [new tag]         v4.3.0b1 -> v4.3.0b1
 * [new tag]         v4.3.0b2 -> v4.3.0b2
 * [new tag]         v4.4.0 -> v4.4.0
 * [new tag]         v4.4.0b1 -> v4.4.0b1
 * [new tag]         v4.4.1 -> v4.4.1
 * [new tag]         v4.4.2 -> v4.4.2
 * [new tag]         v4.4.3 -> v4.4.3
 * [new tag]         v4.5.0 -> v4.5.0
 * [new tag]         v4.5.1 -> v4.5.1

$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working directory clean
$ git remote show origin
* remote origin
  Fetch URL: git@github.com:jiaxiaolei/tornado.git
  Push  URL: git@github.com:jiaxiaolei/tornado.git
  HEAD branch: master
  Remote branches:
    branch1.2 tracked
    branch2.0 tracked
    branch2.1 tracked
    branch4.3 tracked
    branch4.5 tracked
    master    tracked
    stable    tracked
  Local branch configured for 'git pull':
    master merges with remote master
  Local refs configured for 'git push':
    branch4.3 pushes to branch4.3 (fast-forwardable)
    branch4.5 pushes to branch4.5 (up to date)
    master    pushes to master    (up to date)
    stable    pushes to stable    (up to date)
$ git tag
v1.0.0
v1.0.1
v1.1.0
v1.1.1
v1.2.0
v1.2.1
v2.0.0
v2.1.0
v2.1.1
v2.2.0
v2.2.1
v2.3.0
v2.4.0
v2.4.1
v3.0.0
v3.0.1
v3.0.2
v3.1.0
v3.1.1
v3.2.0
v3.2.0b1
v3.2.0b2
v3.2.1
v3.2.2
v4.0.0
v4.0.0b1
v4.0.0b2
v4.0.0b3
v4.0.1
v4.0.2
v4.1.0
v4.1.0b1
v4.1.0b2
v4.2.0
v4.2.0b1
v4.2.1
v4.3.0
v4.3.0b1
v4.3.0b2
v4.4.0
v4.4.0b1
v4.4.1
v4.4.2
v4.4.3
v4.5.0
v4.5.1

扩展阅读:

Git checkout: updating paths is incompatible with switching branches
https://stackoverflow.com/questions/945654/git-checkout-updating-paths-is-incompatible-with-switching-branches
简介:

I believe this occurs when you are trying to checkout a remote branch that your local git repo is not aware of yet. Try:

$ git remote show origin

If the remote branch you want to checkout is under "New remote branches" and not "Tracked remote branches" then you need to fetch them first:

$ git remote update
$ git fetch

Now it should work:

$ git checkout -b local-name origin/remote-name

git签出远程分支问题解决
http://blog.csdn.net/wmzy1067111110/article/details/13512763
简介:

$ git fetch  

$ git checkout -b develop origin/develop
    原文作者:jiaxiaolei
    原文地址: https://www.jianshu.com/p/d1f35d22890e
    本文转自网络文章,转载此文章仅为分享知识,如有侵权,请联系博主进行删除。
点赞