我们的仓库曾经看起来像这样:
* xxxxxxx (master, tag: v2.0.6c) Release v2.0.6c
|\
| * xxxxxxx (develop) Fixes and stuff
| * xxxxxxx Comment here
* | mmmmmmm (tag: v2.0.6b) Release v2.0.6b
|\|
| * xxxxxxx development branches!
. .
但现在我们的 repo 看起来像这样:
* f8cb1b7 (origin/master, master) Do something on develop
* 86848aa Merge branch 'master' of ssh://...
|\
| * f6f8733 (HEAD, tag: v2.0.6c) Release v2.0.6c
| |\
| * \ 30bd2f2 (tag: v2.0.6b) Release v2.0.6b
| |\ \
| * \ \ 68bbe5b (tag: v2.0.6a) Release v2.0.6a
| |\ \ \
| * \ \ \ 35ceefe (tag: v2.0.6) Release v2.0.6
| |\ \ \ \
* | \ \ \ \ 15decce Merge branch 'develop' of ssh://...
|\ \ \ \ \ \
| |/ / / / /
|/| | | | |
* | | | | | 806eebe (tag: v2.0.5a) Release v2.0.5a
|\ \ \ \ \ \
.... etc. Branches keep expanding outwards for each tag/commit
我所知道的是,有人试图从 development 中挑选出一个特定的提交到 master 上,提交它,然后推送它。尝试git reset --hard HEAD^
似乎没有做任何事情,我不知道如何解决它。