Git-pull问题

时间:2009-12-21 19:47:09

标签: git pull

我在本地计算机上创建了一个新的分支“counterflow”,并编辑了我的.git / config文件,如下所示:

[core]
    repositoryformatversion = 0
    filemode = true
    bare = false
    logallrefupdates = true
[remote "origin"]
    url = ssh://host/~/Repositories/CFFC.git
    fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
    remote = origin
    merge = refs/heads/master
[branch "counterflow"]
    remote = origin
    merge = refs/heads/counterflow

CFFC.git是一个裸存储库。现在我试图从另一台机器上拉出“逆流”分支。这台机器上的.git / config文件如下所示:

[core]
    repositoryformatversion = 0
    filemode = true
    bare = false
    logallrefupdates = true
[remote "origin"]
    url = ssh://host/~/Repositories/CFFC.git
    fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
    remote = origin
    merge = refs/heads/master
[branch "counterflow"]
        remote = origin
        merge = refs/heads/counterflow

我收到以下错误消息:

Warning: No merge candidate found because value of config option
         "branch.counterflow.merge" does not match any remote branch fetched.
No changes.

任何线索出了什么问题?

由于

1 个答案:

答案 0 :(得分:2)

我知道了。我忘了在裸存储库中创建分支“counterflow”。