Use a Git branch to merge a file