You can revert the merge commit on master. When you later really want to merge the branch, you will have to revert the revert first. For a detailed explanation, see here:
http://www.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.txt