So when you finish doing this dev, and then you upgrade test/prod I take it you move your update set over. However your production upgrade log would, I assume, still show all of the conflicts and you would lose the "Reviewed and Merged" and "comments" fields, correct? Or do you track your changes externally?

To me, it almost seems like it would have to be: Apply upgrade, apply update set, re-apply upgrade (like Preview again on update sets) so that the system recognizes the update conflicts have been managed, or redo it all manually? Once I clone over dev I lose all the real logs of how I handled my upgrades.

I recognize that I am focusing on something that only impacts up upgrade conflict checks and not the actual code which is fine through update sets, but when I clone all down and step through the conflicts down the road it would still show all these - or is my assumptions incorrect?