Workflow Automation
Allow to specify merge_conflict_style for copy and backport actions
Set `merge_conflict_style: diff3` on `copy` and `backport` to use the diff3 style for conflict markers.
You can now specify the merge_conflict_style options to diff3 to have the conflicting code created using this style.
Was this page helpful?
Thanks for your feedback!