I work on a project that has 2 branches, A and B. I typically work on branch A, and merge stuff from branch B. For the merging, I would typically do:
git mer
You can simply git pull origin branchB into your branchA and git will do the trick for you.
git pull origin branchB
branchA