SAP SE
Conflict resolution for database file merge

Abstract:

Provided are systems and methods for resolving conflicts between different versions of a database file. In one example, the method may include one or more of receiving, at a database, a request to publish a modified version of a database file modified by a user having privileges to update the database file, detecting, during a merge operation, a conflict between one or more data values included in the unpublished modified version of the database file and one or more corresponding data values in an intervening version of the database file published by another user that also has privileges to update the database file, and outputting a user interface displaying an identification of the one or more conflicting data values and one or more selections for resolving the one or more conflicting data values.