関連ワード:  git pull from master and keep local changes    how to git pull and keep local changes    git delete local changes and pull from master  
結果 : git pull from master and keep local changes