0

我在本地机器上创建了一个新分支“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.

任何线索出了什么问题？

谢谢

4

1 回答 1

2

我想通了。我忘记在裸存储库中创建分支“counterflow”。

于 2009-12-21T20:07:49.417 回答