関連ワード:  git pull origin master resolve conflict    git resolve conflicts between branch and master  
結果 : git pull origin master resolve conflict