I was (and still am) a bitcoin user during this period, it was managed relatively easily and quickly; major miners updated their clients and within a few hours, the competing blockchain had died off.

This would likely be even easier to accomplish today; as things currently stand, all mining pools and groups have a vested interest in maintaining the integrity of the blockchain.