Add git merge --no-ff command.