There's a decent amount of bike-shedding over which workflow is the best, and that is a sort of inefficient "fuel" for git as a tool at some level...