12

我从 github.com 分叉了一个 repo，并且还设置了上游遥控器。下面是我的回购

[ Leezhm LIZHM ~/Developments/OF_GIT ] git remote -v
origin  git@github.com:leezhm/openFrameworks.git (fetch)
origin  git@github.com:leezhm/openFrameworks.git (push)
upstream    https://github.com/openframeworks/openFrameworks.git (fetch)
upstream    https://github.com/openframeworks/openFrameworks.git (push)

当我使用这个命令时

git fetch upstream develop
git merge upstream/mac8

它总是出现以下错误

fatal: 'upstream/mac8' does not point to a commit
4

3 回答 3

6

您只是在 fetching ，而upstream/develop您希望 fetch可用。originorigin/mac8

于 2012-11-22T04:43:32.047 回答
2

git fetch
git checkout "new brach"
git pull "new branch"
git merge "new branch"

这对我有用

于 2014-12-23T12:44:09.247 回答
0

中可能没有对应的分支origin/xxx。

于 2012-11-22T02:48:04.060 回答