関連ワード:  git merge of two branches    git merge two branches locally    git merge two branches with different history    git merge two branches command    git merge two branches together    git merge two branches without checkout    git merge two branches with conflicts    git merge two branches from different repositories    git merge two branches into a third    git merge two branches into one