I default to recommending either Github Flow[0] or Gitlab Flow[1] these days. Both of these models simplify Gitflow by dispensing with the long-lived developme

I default to recommending either Github Flow[0] or Gitlab Flow[1] these days. Both of these models simplify Gitflow by dispensing with the long-lived development branch and therefore the complication of needing separate hotfix vs release workflows. The difference between these models is that Github Flow expects you to deploy to environments within a pull request before merging to master, whilst Gitlab Flow expects you to merge to long-lived environment branches for deployment (presumably using Gitlab's CI features). [0] https://guides.github.com/introduction/flow/ https://guides.github.com/introduction/flow/ [1] https://docs.gitlab.com/ee/topics/gitlab_flow.html https://docs.gitlab.com/ee/topics/gitlab_flow.html