結果 : git merge keep all current changes