I have branch Master, branchA and branchB. Now I\'m working in the branchA and I need to merge branchA with
Master
branchA
branchB
on branchB do $git checkout branchA to switch to branch A
$git checkout branchA
on branchA do $git merge branchB
$git merge branchB
That's all you need.