Are Feature Branches the Ultimate Way to Go?
Too Long; Didn't Read
The common workflow for git (git flow) uses feature branches, where a separate branch is created for each new feature. Unfortunately, this strategy has a significant downside - merge conflicts.
However, it's not the only possible strategy, and this article will cover an alternative way to manage new features without these disadvantages.