7

我们正在使用git-flow。我们在几个不同的功能分支上工作并不断收到此错误:

develop|✔ ; git flow feature pull origin RWT-6-valves
Trying to pull from 'feature/RWT-6-valves' while currently on branch 'develop'.
To avoid unintended merges, git-flow aborted.
Fatal: 

通常,恢复到早期版本的开发工作。然而,这是一种痛苦。因此问题:

将来如何避免此消息?

4

2 回答 2

7

我也看到了这个消息。这就是我的处理方式:

首先,尝试同步:

git checkout master
git pull
git push

git checkout develop
git pull
git push

之后,您可以再次尝试该命令:

git flow feature checkout MY_FEATURE_NAME

如果问题仍然存在,请尝试以下操作:

git checkout develop
git flow feature track MY_FEATURE_NAME
git flow feature checkout MY_FEATURE_NAME
git pull origin feature/MY_FEATURE_NAME

我不知道为什么会发生此错误。但是,我希望这个命令可以帮助你处理。

如果您真的想知道为什么会出现此消息,那么第一步可能是深入了解,并在此处研究 git 流的源代码https://github.com/raoulmillais/hgflow/blob /master/git-flow-feature#L495

于 2015-03-13T17:36:18.803 回答
1

发生这种情况是因为您没有RWT-6-valves本地分支。

您必须创建本地分支

$ git flow feature track RWT-6-valves
Branch feature/RWT-6-valves set up to track remote branch feature/RWT-6-valves from origin.
Switched to a new branch 'feature/RWT-6-valves'

Summary of actions:
- A new remote tracking branch 'feature/RWT-6-valves' was created
- You are now on branch 'feature/RWT-6-valves'

然后就可以使用pull命令了

$  git flow feature pull origin RWT-6-valves
Pulled origin's changes into feature/RWT-6-valves.
于 2016-09-21T11:30:07.177 回答