To branch or not to branch?

Posted by Idsa on Programmers See other posts from Programmers or by Idsa
Published on 2011-09-13T13:15:53Z Indexed on 2013/11/07 10:17 UTC
Read the original article Hit count: 287

Till recently my development workflow was the following:

  1. Get the feature from product owner
  2. Make a branch (if feature is more than 1 day)
  3. Implement it in a branch
  4. Merge changes from main branch to my branch (to reduce conflicts during backward merging)
  5. 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?

© Programmers or respective owner

Related posts about continuous-integration

Related posts about branching