結果 : git pull vs git merge from different branch