You can merge it with param --no-commit
git merge --no-ff --no-commit mybranch
So after that your changes from branch "mybranch" will be transfered to your master, but without commit. So you can add changes to version policy and only then do one commit