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
最后编辑于
©著作权归作者所有,转载或内容合作请联系作者
  • 序言:七十年代末,一起剥皮案震惊了整个滨河市,随后出现的几起案子,更是在滨河造成了极大的恐慌,老刑警刘岩,带你破解...
    沈念sama阅读 203,456评论 5 477
  • 序言:滨河连续发生了三起死亡事件,死亡现场离奇诡异,居然都是意外死亡,警方通过查阅死者的电脑和手机,发现死者居然都...
    沈念sama阅读 85,370评论 2 381
  • 文/潘晓璐 我一进店门,熙熙楼的掌柜王于贵愁眉苦脸地迎上来,“玉大人,你说我怎么就摊上这事。” “怎么了?”我有些...
    开封第一讲书人阅读 150,337评论 0 337
  • 文/不坏的土叔 我叫张陵,是天一观的道长。 经常有香客问我,道长,这世上最难降的妖魔是什么? 我笑而不...
    开封第一讲书人阅读 54,583评论 1 273
  • 正文 为了忘掉前任,我火速办了婚礼,结果婚礼上,老公的妹妹穿的比我还像新娘。我一直安慰自己,他们只是感情好,可当我...
    茶点故事阅读 63,596评论 5 365
  • 文/花漫 我一把揭开白布。 她就那样静静地躺着,像睡着了一般。 火红的嫁衣衬着肌肤如雪。 梳的纹丝不乱的头发上,一...
    开封第一讲书人阅读 48,572评论 1 281
  • 那天,我揣着相机与录音,去河边找鬼。 笑死,一个胖子当着我的面吹牛,可吹牛的内容都是我干的。 我是一名探鬼主播,决...
    沈念sama阅读 37,936评论 3 395
  • 文/苍兰香墨 我猛地睁开眼,长吁一口气:“原来是场噩梦啊……” “哼!你这毒妇竟也来了?” 一声冷哼从身侧响起,我...
    开封第一讲书人阅读 36,595评论 0 258
  • 序言:老挝万荣一对情侣失踪,失踪者是张志新(化名)和其女友刘颖,没想到半个月后,有当地人在树林里发现了一具尸体,经...
    沈念sama阅读 40,850评论 1 297
  • 正文 独居荒郊野岭守林人离奇死亡,尸身上长有42处带血的脓包…… 初始之章·张勋 以下内容为张勋视角 年9月15日...
    茶点故事阅读 35,601评论 2 321
  • 正文 我和宋清朗相恋三年,在试婚纱的时候发现自己被绿了。 大学时的朋友给我发了我未婚夫和他白月光在一起吃饭的照片。...
    茶点故事阅读 37,685评论 1 329
  • 序言:一个原本活蹦乱跳的男人离奇死亡,死状恐怖,灵堂内的尸体忽然破棺而出,到底是诈尸还是另有隐情,我是刑警宁泽,带...
    沈念sama阅读 33,371评论 4 318
  • 正文 年R本政府宣布,位于F岛的核电站,受9级特大地震影响,放射性物质发生泄漏。R本人自食恶果不足惜,却给世界环境...
    茶点故事阅读 38,951评论 3 307
  • 文/蒙蒙 一、第九天 我趴在偏房一处隐蔽的房顶上张望。 院中可真热闹,春花似锦、人声如沸。这庄子的主人今日做“春日...
    开封第一讲书人阅读 29,934评论 0 19
  • 文/苍兰香墨 我抬头看了看天上的太阳。三九已至,却和暖如春,着一层夹袄步出监牢的瞬间,已是汗流浃背。 一阵脚步声响...
    开封第一讲书人阅读 31,167评论 1 259
  • 我被黑心中介骗来泰国打工, 没想到刚下飞机就差点儿被人妖公主榨干…… 1. 我叫王不留,地道东北人。 一个月前我还...
    沈念sama阅读 43,636评论 2 349
  • 正文 我出身青楼,却偏偏与公主长得像,于是被迫代替她去往敌国和亲。 传闻我的和亲对象是个残疾皇子,可洞房花烛夜当晚...
    茶点故事阅读 42,411评论 2 342

推荐阅读更多精彩内容