Once the branch is updated, presumably the build is run again with the changes (now) applied to the latest code from the main branch. So the test suite (and type checker, linters, etc.) will run against the broken code and thus will at least have the chance to catch the error introduced by the conflict. Without the rebase and extra run of the build, that error would have landed on the main branch.
Fission, Kubernetes, Prometheus, GitLab, Bootstrap 4, DX, DevOps etc.
1 of 900 identified maintainers elected by GitHub (Jun 2022): https://github.blog/2022-06-24-thank-you-to-our-maintainers/
I don't understand how this can solve conflicts.
Once the branch is updated, presumably the build is run again with the changes (now) applied to the latest code from the main branch. So the test suite (and type checker, linters, etc.) will run against the broken code and thus will at least have the chance to catch the error introduced by the conflict. Without the rebase and extra run of the build, that error would have landed on the main branch.
Thanks a lot for answering :)
Interesting! Are you using only short-time tests, not full test like integration tests?