関連ワード:  git merge branches with different commit histories    git merge branches with unrelated history    git merge changes between branches  
結果 : git merge branches with different commit histories