Branch A and B can merge in from mainline every hour, but you wont catch problems with A+B until either is merged _into_ master. Yes, you can catch the problem

Branch A and B can merge in from mainline every hour, but you wont catch problems with A+B until either is merged _into_ master. Yes, you can catch the problem in staging, but you might have caught it before that if you had merged earlier. > Without distinct feature branches, you end up in abysmal horror situations where you push something, realize you have a bug in production, but can't roll it back without rolling N other features back. I don't think having a dev branch in an unshippable state is an abysmal horror situation. And even if you use feature branches for everything, that does not mean you can necessarily roll back the commits easily.