Should CI create a merged branch behind-the-scenes and run tests on that before allowing the branch to be merged?
The answer to that is: yes. The final test cycle before landing code to master MUST be against the code that would be in master after merging.
This is what the better workflow tools do, among other things to prevent these weird error situations. We have Marge-bot for Gitlab. Uber open-sourced their tool for the same some time back.[0] Bors comes up often as a reference, too.[1]
Comments
The answer to that is: yes. The final test cycle before landing code to master MUST be against the code that would be in master after merging.
This is what the better workflow tools do, among other things to prevent these weird error situations. We have Marge-bot for Gitlab. Uber open-sourced their tool for the same some time back.[0] Bors comes up often as a reference, too.[1]
0: Discussion at the time: https://news.ycombinator.com/item?id=19692820
1: https://github.com/bors-ng/bors-ng
This is helpful, thank you. I will bring this up with my colleagues.