-
Type:
Bug
-
Resolution: Unresolved
-
Priority:
Medium
-
None
-
Affects Version/s: 1.5.5.1
-
Component/s: None
-
None
-
Environment:
Snow Leopard
-
Severity 3 - Minor
When closing a hg-flow feature branch/bug fix branch, SourceTree collapses all the separate commits into a single commit, which is the default hg-flow behaviour.
However, there are times when I would prefer to keep all the separate commits, so I have a history of some of the changes I've made.
I know the git-flow default for closing a feature branch is "git merge --no-ff myfeature", which collapses all commits into one. To do the close/merge without collapsing, you can do "git merge myfeature".
How can I close the branch without collapsing in hg-flow ?
How to do it in SourceTree GUI for both hg-flow and git-flow ?
Ideally I would like to be able to cherry pick multiple commits to keep when closing the branch, so these cherry-picked commits will appear in the develop branch for reference.