関連ワード:  git pull merge mode    difference between git pull and merge  
結果 : git pull merge mode