When both commit and branch are set, prefer commit. This is simpler for us to implement here than extending the OCP functionality.