関連ワード:  git pull resolve conflicts their    git pull merge conflict theirs    git pull merge conflict accept theirs    git cancel pull with conflicts  
結果 : git pull resolve conflicts their