Skip to content

Fix the strategy to apply when rebase fails.

Sergi Blanch Torné requested to merge sergi/ci-uprev:bugfix_rebase_strategy into main

It was set to 'theirs' the strategy specification with the default rebase failed. But this comes from a confusion between what ours/theirs mean between merge and rebase actions. It must prevail what's in the default branch because it is what is already merged into the project.

Merge request reports