I have been practising something that we might call "continuous rebase", for the lack of better term. It is essentially a combination of feature branches and co

I have been practising something that we might call "continuous rebase", for the lack of better term. It is essentially a combination of feature branches and continuous integration, but instead of making frequent merges from a feature branch into the master it is done in the opposite direction: the feature branch is frequently rebased on top of the master (or, at the very least, the master is merged into the feature branch, if the rebase is too difficult). This approach has the advantages of both of the other approaches: * the code is integrated with a great frequency * any conflicts can be resolved in the feature branch and will not break the master * the new features are isolated, and there is no need for feature switches