関連ワード:  git undo pull keep local changes    git pull with discard local changes  
結果 : git undo pull keep local changes