Donald Trump has won a battle with Colombia after threatening a trade war when the country refused to accept deported migrants.