[wvanbergen]

The branches that are being merged are tested, also in the first version. However, different branches can conflict with each other, and break the master builds. This was happening often enough for us to want to prevent this.

The simple way would be to rebase your branch (or merge in master). However, with the amount of changes that are being merged, by the time the CI result comes in for your rebased branch, the tip of master is already changed making the CI result obsolete. So we went for the queue approach instead.

[pojzon]

Dont know if I respond to author, but either way the end solution was to merge into semi master and run CI before merging to master..

So overall you came to conclusion that what you explained even if can fail is pretty much the best way you can do it.. (rebase just custom..)

Overall DevOps principles are proven to simply work, you just have to follow them..