git flow 与 release/v1.8 分离

Question

我正在进入一个项目的 git flow 并尝试学习。

我有三个特点。我对所有三个都运行了 git flow feature finish。两个给了我提交信息，一个没有。所有功能分支都合并到develop。

我推送到 repo 并拉到暂存。

当我检查发布分支时，我收到了这条消息。

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:

git checkout -b new_branch_name

HEAD is now at 69ca088... Merge branch 'feature/12485--change-views-fontcolor' into develop
394elmp02:docroot 394e ((69ca088...)) $ git branch
* (detached from origin/release/v1.8)
  develop
  feature/12437--Update-Media-Disease-lp
  master
394elmp02:docroot 394e ((69ca088...)) $

上面显示的功能是没有弹出提交消息的功能。

我不知道如何进步。有人可以分享一些见解。 谢谢！

Answer 1

好的，想通了。与暂存站点上的功能分支发生冲突。一旦我删除了它，然后重新检查了发布分支，一切都很好。