I have branch Master, branchA and branchB. Now I\'m working in the branchA and I need to merge branchA with
Master
branchA
branchB
For merging first branch to second one:
on first branch: git merge secondBranch
on second branch: Move to first branch-> git checkout firstBranch-> git merge secondBranch