'65 Squad Level Combat in Vietnam. On Kickstarter!
Thanks Max, this is how we have been playing it.
This is covered in a couple of places in the rules. If you are in the middle of a combat when the final End Turn is drawn, resolve the combat.
Command Ops (pg 18) has different rules.
When I need an extra card or two at the end of the turn, I just flip the discard pile and draw from the middle. I don't feel there's a need to reshuffle, but you can do it if you want to. After resolving the combat THEN you reshuffle to start the next turn.