git merge并得到此错误“不指向提交”

Question

我从github.com分出了一个回购，并设置了上游远程。 以下是我的回购

[ 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

Answer 1

您只是提取upstream/develop，而您想要提取origin以使origin/mac8可用。

Answer 2

git fetch
git checkout＆＃34; new brach＆＃34;
git pull＆＃34; new branch＆＃34;
git merge＆＃34; new branch＆＃34;

这对我有用

Answer 3

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