2014-02-26 35 views
1

我正在進入一個項目的git流,並試圖學習。從版本中分離的git流/ v1.8

我有三個功能。我全部都跑完了git flow功能。兩個給我提交信息,一個沒有提交。所有功能分支都合併到開發中。

我推到回購站並拉到分期。

當我檢查發佈分支時,我收到了這條消息。

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...)) $ 

上面顯示的功能是沒有彈出提交消息的功能。

我不知道如何進步。有人可以分享一些見解。 謝謝!

回答

0

好的,想通了。與暫存站點上的功能分支發生衝突。一旦我刪除了,然後重新檢查了發佈分支,一切都很好。