結果 : when does git create a merge commit