Comments by "p11" (@porky1118) on "Continuous Integration vs Feature Branch Workflow" video.

  1. Before I watch the video: I also recognized, that too much branching is rather worse than beneficial. It should only be done for complex features, which might effect everyones work in a negative way. Like some major rework of an important feature. I like to let interns work on their own branches, so they don't fear messing up everything, but most of the time, I just merge everything as it is and fix problems later anyway. Only if it's something very bad, I would not merge it. But the worst thing, that happened so far, were some commits of unintended data, which weren't that bad, so I didn't merge everything, but cherry-picked a few commits.
    1