Allow merge to master or modifications to master with pull request

Question

Today I work with the GitFlow method available from GitKraken.

When there's a new feature we start a branch on the Feature that goes to Develop and then there's a Release.

When there's a bug fix, we start a branch on the Hotfix, which goes to Develop and then a Release.

It happens that when there is a release, the code is placed in the Master. But since there is a risk that something was accidentally uploaded or even the developer deleted something, we want to approve everything that goes to the Master.

We saw this Bitbucket article "Suggest or require checks before a merge" and enabled the branching permission, but still, people are able to send everything to the master without having to approve what was sent. How can I control what goes to the Master?

Theodora Boudale · Answer

That's good to hear, thank you for the update @ThePokyWizard!

And thank you @Ulrich Kuhnhardt _IzymesCo_ for noticing the branch name!

ThePokyWizard · Answer

Thanks @Ulrich Kuhnhardt _IzymesCo_ ,
I made the suggested modification by support (enable: Prevent a merge with unresolved merge checks) and also changed the branch name to master and it worked.

Ulrich Kuhnhardt _IzymesCo_ · Answer

@ThePokyWizard If you just need to control direct push from local to remote master just enter 'master' into the Branch permission's "select branch" input field. (It's currently set to 'main')

Obviously you can nominate exceptions for some user(s) as you have done and let the rest of the team merge to 'master' via PR only.

This should be sufficient to accomplish your goal of limiting who can push to 'master'.

Let me know how you go.

Best, Ulrich

Izymes

// Eliminate boring from work