Git merge two local branches

Question

I have branch Master, branchA and branchB. Now I\'m working in the branchA and I need to merge branchA with

Answer 1

Here's a clear picture:

Assuming we have branch-A and branch-B

We want to merge branch-B into branch-A

on branch-B -> A: switch to branch-A

on branch-A: git merge branch-B