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…