MCQ: Combining Changes from Multiple Streams of Development

PreTest

Assuming that there are two different streams of development (branchA and branchB) how do you combine the changes from branchA into branchB using git.  You are working in branchA.

1)  gitCombine A B

2) merge branchB into branchA

3) git combineB

4) git merge branchB

PostTest

(same question)

1) git_combine branchB into branchA

2) git merge branchB

3) git combine branchB into branchA

4) git merge branchB into branchA