To branch or not to branch?
- by Idsa
Till recently my development workflow was the following:
Get the feature from product owner
Make a branch (if feature is more than 1 day)
Implement it in a branch
Merge changes from main branch to my branch (to reduce conflicts during backward merging)
Merge my branch back to main branch
Sometimes there were problems with merging, but in general I liked it.
But recently I see more and more followers of idea to not make branches as it makes more difficult to practice continuous integration, continuous delivery, etc. And it sounds especially funny from people with distributed VCS background who were talking so much about great merging implementations of Git, Mercurial, etc.
So the question is should we use branches nowadays?
