Skip to content

backport-script: handle merge conflicts when merging a branch

Ben Boeckel requested to merge ben.boeckel/vtk:backport-script-merge-conflicts into master

Backport: release

Merge request reports