git-flow：为什么“ git-flow功能完成-S”仍然创建合并提交？
[英]git-flow: why does “git-flow feature finish -S” still create a merge commit?
问题描述
I have locally developed a feature which consists of a couple of "work in progress" commits. 
我在本地开发了一个功能，其中包含几个“正在进行的工作”提交。 When I'm going to finish this feature using git-flow feature finish -S , I would expect to get one clean commit in develop . 当我将使用完该功能git-flow feature finish -S ，我希望得到一个干净的人犯develop 。 However, I get an additional merge commit on top of the squashed commit which references my "work in progress" commits from the obsolete feature branch. 但是，在压缩的提交之上，我还有一个额外的合并提交，它引用了过时的功能分支中的“正在进行的工作”提交。 What's the purpose of this behavior? 这种行为的目的是什么？ Can this additional merge commit be skipped? 可以跳过此额外的合并提交吗？
1 个解决方案
解决方案1
1 已采纳 2013-05-30 14:51:33
The only idea I have is, that the squashed commit is used to show all changes in one single commit, but keeping the history for whatever reason. 我唯一的想法是，压缩的提交用于显示单个提交中的所有更改，但无论出于何种原因都保留历史记录。
The usual way of using the squash commit to get rid of the detail commits, seems not to be supported by this command (don't know why). 该命令似乎不支持使用壁式提交来摆脱详细提交的通常方法（不知道为什么）。
声明:本站的技术帖子网页，遵循CC BY-SA 4.0协议，如果您需要转载，请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.