Don't rebase if not needed; Checkout -f to be sure
This is trying to resolve the issues found in: https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/68097296 * Use checkout -f whenever checking out to a new branch (See that `?? vendor/gitaly-ruby/`? That's another thing which would break) * Skip rebasing whenever `ce_merge_base` and `ce_fetch_base` are the same.
Showing
Please register or sign in to comment