結果 : git merge locally without commit