This has happened to me in three games post patch:
I am on a continent with several civs. I go to war with one and take over every connected city - ie, they still have some small "satellite" cities on islands or on the other side of another civ. I allow a peace, and work culture on the conquered cities to grow back the borders.
After several turns, all the natives are happy (revolts over, even WLTK sometimes), when one of the cities revolts.
My culture is way over theirs at this point. I have two units garrisoned and everyone is happy.
I would prefer not to make all the natives into workers or settlers, but is this the best choice?
Do more garrisoned troops do anything once the revolt is over?
Should I stay at war so at least I can re-conquer without incident?