With the introduction of Heroku pipelines and the general complexity of Git Flow, we decided to change the way we work with Git.

Marc G Gauthier

Drivy's engineering team moved away from Git Flow after adopting Heroku Pipelines, which made the master branch redundant in their release process. Their simplified flow uses feature branches merged into master, with CI auto-deploying master to staging, and any developer promoting staging to production when ready. The post covers bundling multiple commits into a single release, handling cases where commits need to be held back, and performing hotfixes by checking out the latest production tag and branching from there.

Simple Git Flow With Heroku Pipelines