SHELL

git merge a file from another branch to current branch

git checkout <branch name> <path to file> --patch

merge another branch into current

git checkout branch_name // checkout to branch you want to merge to if not in it already
git merge branch_to_merge_from