関連ワード:  git pull keep current changes    git merge keep current changes    git merge keep all current changes    git remove all current changes  
結果 : git pull keep current changes