I think the problem here could be that you haven't separated the development changes from the validation changes. Maybe what you could do is to have a workflow like dev > validate > master. When you have the required changes ready you merge dev into validate. Test everything on validate branch and then sync the changes to master. While you are validating if there are any new changes they can be merged to dev branch without affecting your validation process.