Rebasing instead of having additional merge commits laying around the log. Feature branches that usually always pass CI (so you can easily roll back to a worki

Rebasing instead of having additional merge commits laying around the log. Feature branches that usually always pass CI (so you can easily roll back to a working deployable state)