関連ワード:  git pull conflict overwrite local    git merge conflict overwrite local changes    git resolve merge conflict overwrite local changes    git pull with discard local changes  
結果 : git pull conflict overwrite local