結果 : git merge master into branch without commit