関連ワード:  git pull merge strategy ours    git pull merge strategy theirs  
結果 : git pull merge strategy ours