関連ワード:  git merge base example    git merge theirs example    git merge example  
結果 : git merge base example