For a project with mainly one developer, when converging #git branches: