what is the difference between "revert to base system" and "save merge" buttons?

[santy1]

In Upgrade history(in geneva) under resolve conflicts what is the difference between "revert to base system" and "save merge" buttons?

[cyngoltz]

Same question....The purpose of the "Revert to base system" button is pretty clear to me, but, in general, I am unsure of the "Save merge" button's function.

[chris_f]

My understanding is that "Save merge" will save any merges you have made (I.e. The base and your customised version differ, you take a new piece from the latest OOB element but retain some of your own customisations(as if you didnt wish to retain any of your customisations, you'd revert it base system).

Base system is how Service Nmow have coded it. E.g. They may have decided to delete a module, reverting yours to base will therefore apply this deletion.

Save merge is still keeping us off the upgrade path, so next upgrade, we will have the same update skipped and need reviewing.

This is my current understanding.

[Matt Hernandez]

It looks to me that "Save Merge" really just sets the state of the conflict record. From reading the Docs site, I think its up to you to manually make the merge, and this resolution engine just allows you to record the fact that you've done so. I have included the URL and a small screenshot that I took from that page.

https://docs.servicenow.com/bundle/jakarta-servicenow-platform/page/administer/platform-upgrades/tas...