Attempting a fix for a problem where merge fails because there is nothing to commit.