The easiest way is to set your repository to the branch you want to merge with, and then run
git checkout [branch with file] [path to file you would like to merge]
If you run
git status
you will see the file already staged...
Then run
git commit -m "Merge changes on '[branch]' to [file]"
Simple.