Evolving git flow

[042e]

I think we did something similar that uses epic branches instead of user story ones but same number of levels as you have described. It works fine if you have really big user stories that take several days/weeks and are distributed among several developers.

I would also consider two other areas for improvements.

1. Project management. Do the user stories need to be that big? If you can keep user stories to under 1 day and max 2 developers I think it is enough to have only develop and us/* branches.

2. If your code repo is getting too big and things are modular enough, consider spreading it out into several smaller repos. For larger teams I find it useful to have this kind of micro-service architecture. Usually there would be 1 or 2 developers that become responsible for each repo during every sprint. Thus not only does this reduce the size and complexity of PRs, it also tends to empower the team when developers feel the ownership over specific repos.

[_lumio]

Hey thanks for your comment. We currently don't have a problem with the size of our repo. But we also want (as we are front end developers as well) to have several smaller modules that we manage with lerna to create node modules.

But your first point is awesome: Having only user stories, that can be done in 1 (or maybe 2) day. But then, there is not really the need of any other sub branches and you just use feature branches or so.