Just commit and merge everything together at the same time. What’s the worst that coul happen, eh?