News for hackers. Stuff that matters.
Re:Safer branching by kannonboy on Thursday October 06, 2016 @02:38PM (#12654900)
Absolutely. An alternative title for the comic would be "For the love of branch permissions". The second developer in the comic is doing the right thing by creating a feature branch.

However even in a strict branching workflow, there's still a chance you'll have genuine integration failures when two branches are merged, even if they independently pass the tests.

Re:Safer branching by sytse on Thursday October 06, 2016 @09:27PM (#12657484)
I totally agree it should have been a merge request and the master branch should be protected so novices can't merge to it.

There is a chance that the merge itself breaks the build. I must say that in practise we don't often see this. Maybe because we keep our branches small. Other people seem to be more aware of this problem https://gitlab.com/gitlab-org/gitlab-ce/issues/4176