And git merge --no-commit to do whatever you want on the proposed merge before actually creating the commit. Test or whatever else.