How do I revert Skipped Manual Merge changes to baseline?

[david631]

I have a global scoped app which my company developed for internal processes. We make changes in a dev instance, publish a new version when we're ready for testing, and then upgrade the app in our UAT instance. I get a long list of "Skipped Manual Merge" changes every time I do this, and many fixes and other changes I've made in Dev do not show up in UAT. I want to revert everything in UAT to baseline, but the system will not allow this from the sys_upgrade_history page where the skipped changes are listed. I also cannot revert the skipped changes after opening each one and clicking the "Resolve Conflicts" related link because the system loads a blank screen. I've tried deleting everything in the sys_update_xml table, and this deliminated several hundred of the skipped changes; however, there are still many more changes getting skipped that I can't revert. I don't want to uninstall the entire app because I have test data in tables that I want to preserve. Does anyone know how to revert an app to baseline without reinstalling it entirely?

[Allen Andreas]

Hi,

Just to clarify, the app would be baseline when you installed it.

Are you saying that you've made changes to the app in the UAT environment and so now they're out of sync?

Please mark reply as Helpful, if applicable. Thanks!

[david631]

Yes, I've made changes to the app in UAT and so they are out of sync. I want to revert these changes to Dev because the changes I made in UAT were bug fixes that I've back-filled in Dev.