[git-merge] How do I merge a git tag onto a branch