DEV Community

Discussion on: Why you should not use (long-lived) feature branches

Collapse
 
timothymcgrath profile image
Timothy McGrath

Interesting article, I just think the 1 or 2 day limit is a bit tight. I love to get back to master as soon as possible, but at the same time I don't think uncompleted code should be merged to master. Feature toggles can help with that, but only if it is a new pathway. If you are refactoring or modifying existing code it may not be possible to feature toggle it.

We run a simple git flow with a master branch and a branch for each work item or bug we work on. The code merges to master as soon as the work item is code completed and dev tested. The intention is that no work item should take longer than a week.

You're right about any branch that sits around for too long is never going to make it to master.