I suspect that is exactly the method most developers would uses in that situation.

All versions controls have a way to compare, merge and revert historical changes in and out of the current working copy.