Set git to prevent automatic merge commits