Don't let merge conflicts dictate your workflow.Are branching strategies designed to avoid conflicts slowing you and your team down?If you are assigning every developer a separate feature to build be prepared for knowledge silos and individual features shipping no faster than they would with a single developer. Whilst doing away with branching all together comes at the cost of additional development and testing to ensure work in progress doesn't break existing functionality. So we built a faster way to work together. |