Question: Git merging one branch into another is a two way merge?