Git pull用章鱼策略合并了错误的分支

时间:2017-04-25 19:45:44

标签: git

我一直致力于从feature分支分叉的release分支。我决定改变分支,所以我做了:

git commit -a
git push
git checkout release

发布分支机构落后20次,消息显示可以快速转发。我做了git pull并得到了输出:

Fast-forwarding to: 10b836074b97d2b3a41690c6d92551922d77b256
Trying simple merge with f0c7df27be7bb118818732a9f92c37da1b1e2b04
Simple merge did not work, trying automatic merge.
Auto-merging app/index.html
Merge made by the 'octopus' strategy.

此合并的功能分支,我之前正在处理发布分支:

Merge branches 'feature' and 'release-1.1.46' of ssh** into release-1.1.46

有谁知道为什么会这样?

0 个答案:

没有答案