hierarchical features

309 views
Skip to first unread message

jacoba

unread,
Dec 30, 2011, 6:02:37 PM12/30/11
to gitflow-users
Does git flow support features hierarchy?
I have a major feature which I want to break into 2-3 sub features,
and I want their code to be branched off the major feature.
I know I can do that with regular git commands, but I wonder if the
git flow commands support that or planning to.
Thanks,
Jacob

Mark Derricutt

unread,
Dec 30, 2011, 6:12:10 PM12/30/11
to gitflo...@googlegroups.com
Not directly - tho I done this in the past and have thought about turning it somehow into a command.  But...

1) Start a new feature, call it your-epic
2) git branch -m feature/your-epic to stream/your-epic
3) git flow init - reconfigure git-flow to use stream/your-epic as the develop branch, use your-epic as the feature prefix
4) start/finish features as normal, git-flow merges features back into epic/your-epic
5) when finished, git flow init back to normal settings
6) git branch -m stream/your-epic back to feature/your-epic
7) git flow feature branch feature/your-epic

Automating this into some form of "git flow epic start/finish" would be good, but could be messy keeping track of all the different configuration pairs, should be doable tho.

--
"Great artists are extremely selfish and arrogant things" — Steven Wilson, Porcupine Tree

Aseem Kishore

unread,
Dec 30, 2011, 6:14:22 PM12/30/11
to gitflo...@googlegroups.com
Why not just:

```
git flow feature start full

git flow feature start sub feature/full # says to start the "sub" feature from the "feature/full" branch
git flow feature finish sub

# ...
# repeat for other subfeatures

git flow feature finish full
```

?

Aseem

Peter van der Does

unread,
Dec 30, 2011, 8:36:44 PM12/30/11
to gitflow-users
The git flow feature finish sub merges all changes into the develop
branch, not the feature/full branch

Aseem Kishore

unread,
Dec 30, 2011, 10:32:11 PM12/30/11
to gitflo...@googlegroups.com
Ah thanks, did not know that.

Aseem

Reply all
Reply to author
Forward
0 new messages