为了避免意外的合并，git流被中止

我们正在使用。我们在几个不同的功能分支上工作，并不断出现以下错误：

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: 

通常，恢复到早期版本的develop works。然而，这是一种痛苦。因此，问题是：

---

今后如何避免此消息？我也看到了此消息。我是这样处理的：

首先，请尝试同步：

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流的源代码。

这是因为你没有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.