The Mexican–American War , also known in the United States as the Mexican War and in Mexico as the Intervención Estadounidense en México ( `` United States intervention in Mexico '' ) , was an armed conflict between the United States and Mexico from 1846 to 1848 .