関連ワード:  git pull and merge local changes    does git pull merge local changes  
結果 : git pull and merge local changes