git checkout branch_to_merge_into #Get into the branch first git merge incomingBranch #merge incomingBranch into branch_to_merge_into