This was an interesting thread to read through, and pretty validating I think that most answers are "it's just hard, so avoid the situation if you can, keep things merging".

Holiday breaks are a perfectly reasonable time to deploy freeze to give actual humans a break from heavy prod support.