Our defence editor assesses how conflict has changed in recent years