関連ワード:  git pull and keep remote changes  
結果 : git pull and keep remote changes