Gitflow：合并要开发的修补程序分支进行到母版的合并提交

Question

I'm on a project that's (sort of) following gitflow. It has a master and develop branch and it's had some releases already (these were done from develop to master because we were doing it wrong, but I don't think it changes the question).

Now there's a hotfix we need to make. We create a hotfix-x branch off of master , bump the version, make the change, and merge it to master . Now we try and merge the hotfix-x branch back to develop . But because the hotfix-x branch was created off of master , it includes all the merge commits from develop to master .

We don't want those merge commits in develop , do we? How do we handle this?

Answer 1

从评论来看，这只是gitflow的预期结果，因此我将继续并关闭它。