"Political Solution" and "Military Solution", if you use the latter; or perhaps better, in the terms used by brothers Mao and Giap, "Political Struggle" and "Military Struggle". The appropriate mix of the "Political" and the "Military" in a given situation is really the graduation question, isn't it.

One point of confusion regarding the "Political Struggle" is that its "politics" are not necessarily the same as the "politics" that drive the "policy" - of which, the "Military Struggle" and the "Political Struggle" are continuations.

E.g., In both China and Vietnam (I and II), land reform was the major component of the anti-feudal "Political Struggle"; and would have resulted in a vastly increased number of independent farm owners. However, the Communist politics and policy required ultimate collectivization of farming, with "land reform" being only an intermediate step (sufficient to bring the communists to power).

We (US) are far from integrating the "Political Struggle" and the "Military Struggle" into our doctrines concerning armed conflicts.

Regards

Mike