Expert Python Programming - Third Edition

Merge testing through CI

Reality is complicated. If the code on a feature branch passes all the tests, it does not mean that the build will not fail when it is merged to a stable mainstream branch. Both of the popular branching strategies mentioned in the GitFlow and GitHub Flow section assume that code merged to the master branch is always tested and deployable. But how can you be sure that this assumption is met if you did not perform the merge yet? This is a lesser problem for GitFlow (if implemented well and used precisely), due to its emphasis on release branches. But it is a real problem for simple GitHub Flow, where merging to master is often related with conflicts and is very likely to introduce regressions in tests. Even for GitFlow ...