2 years ago

#41092

test-img

MuyBien

How to handle hotfix in GitFlow and GitLab MR's?

We use GitLab and its MRs. We use a gitflow (just without release branches). Master is our production branch and develop the current dev branch. Master and develop are protected on GitLab so any push is impossible.

My concern is about the way to update master with develop. Because merging an MR behind the target branch is disable (you have to rebase), how can we update the master with develop with an MR when a hotfix is being merged in master? The develop branch is then behind the master and merge is impossible. The local merge is then necessary and we need to grant the push right to administrator?

git

gitlab

git-flow

merge-request

0 Answers

Your Answer

Accepted video resources