Learn More
Resend Email
2
ScriptCoded
5y

Has anyone had success with GitFlow hotfixes and GitHub branch protection rules? Finishing a hotfix requires pushing directly to develop, but GitHub prevents it if PR policies are set up :/

question

github

pullrequest

gitflow

hotfix
Favorite
Ranter
Comments
  • 2
    5y
    Gitflow is not designed to support pull requests, it's more of high trust process. I tend to call gitflow with PRs "gateflow," you'll need to manage it manually.
  • 1
    5y
    @SortOfTested Yeah, it's not well suited for PRs. Any idea how to manage hotfixes if we still want to keep the idea of a master and develop branch?
  • 1
    5y
    To provide a workaround, you may want to adopt a fork repo model. You can gitflow all the way to the fork trunk, and then PR from that fork trunk to the release repo, similar to how a private->public promotion models work.
  • 1
    5y
    @ScriptCoded
    Sans my other suggestion, you'll need to make PRs non-mandatory, or migrate to gitlab which lets you modify the conventional gated flows.
  • 1
    5y
    @SortOfTested I'll have a look at a forking model. We recently moved from BitBucket, so I don't think another move would be appreciated... :'(

    Thanks for the advice :)
  • 1
    5y
    Can you just do a PR into development? Or am I missing something here?
  • 1
    5y
    @vorticalbox Yeah, but that defeats the purpose of the pr, since it would already be in master
  • 1
    5y
    @ScriptCoded nothing wrong with back pr fixes from master to dev. At least I don't see it and we do it from time to time at work
Related Rants
devRant © 2021 Hexical Labs LLC
Privacy Policy  |  Terms of Service
Add Comment