Don’t know if it’s the correct thread to ask about it, but I’m trying to change the way my team use git to incorporate hotfix.
After a meeting and considering the context, the team choose to follow this type of flow https://docs.gitlab.com/ee/topics/gitlab_flow.html#environment-branches-with-gitlab-flow
So, in our case, 3 permanent branches for environment + 2 tempory (feature + hotfix).
But I would like to have a different strategy to avoid to change the way the team used to work with dev branche.
Dev ==> MR only Merge ff + rebase (But special case for hotfix, this case will be handle differently)
Stage ==> MR only Merge no-ff
Master ==> MR only Merge no-ff
Can we have different MR strategy on this repo or what is the best way to do what I need ?
thanks