Create MR option to solve conflicts by using the source branch
Problem to solve
We have a customer that is using environment branches. They often have hotfixes, which are cherry-picked into the pre-production
and production
branches. These hotfixes often cause conflicts when merging master
into pre-production
. Changes in master
are often big, so the resolve conflicts
option does not show up in GitLab when merging into the environment branches.
Intended users
Developers, release managers
Proposal
Consider adding option to resolve conflicts by always preferring the changes in the source branch.
Links / references
ZD https://gitlab.zendesk.com/agent/tickets/119853 (internal)