Conflict resolution for database file merge
AssigneeSap SE
InventorJan Rittinger
Life of this patent
Estimating the term…
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.
Claims21
A computing system comprising:
- a processor configured to
- receive a request to publish a modified version of a database file modified by a user having privileges to update the database file,
- detect a conflict between one or more data values of hierarchical data included in a table of the unpublished modified version of the database file and one or more corresponding data values of corresponding hierarchical data in an intervening version of the database file published at the database by another user that also has privileges to update the database file,
- determine a suggested aggregation layer of the one or more conflicting data values within different aggregation layers of the hierarchical data included in the table based on an amount of conflicts within suggested aggregation layer, wherein a column of conflicting data values in the suggested aggregation layer of the table encompasses an aggregate of all conflicting data values from among a plurality of columns of conflicting data values within a next lowest aggregation layer of the table, and
- output a user interface displaying an identification of the one or more conflicting data values in the suggested aggregation layer and one or more selections for automatically resolving the one or more conflicting data values at the database.
A method comprising:
- 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 a conflict between one or more data values of hierarchical data included in a table of the unpublished modified version of the database file and one or more corresponding data values of corresponding hierarchical data in an intervening version of the database file published at the database by another user that also has privileges to update the database file;
- determining a suggested aggregation layer of the one or more conflicting data values within different aggregation layers of the hierarchical data included in the table based on an amount of conflicts within suggested aggregation layer, wherein a column of conflicting data values in the suggested aggregation layer of the table encompasses an aggregate of all conflicting data values from among a plurality of columns of conflicting data values within a next lowest aggregation layer of the table;
- and
- outputting a user interface displaying an identification of the one or more conflicting data values in the suggested aggregation layer and one or more selections for automatically resolving the one or more conflicting data values at the database.
A non-transitory computer-readable storage medium storing program instructions that when executed cause a processor to perform a method comprising:
- 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 a conflict between one or more data values of hierarchical data included in a table of the unpublished modified version of the database file and one or more corresponding data values of corresponding hierarchical data in an intervening version of the database file published at the database by another user that also has privileges to update the database file;
- determining a suggested aggregation layer of the one or more conflicting data values within different aggregation layers of the hierarchical data included in the table based on an amount of conflicts within suggested aggregation layer, wherein a column of conflicting data values in the suggested aggregation layer of the table encompasses an aggregate of all conflicting data values from among a plurality of columns of conflicting data values within a next lowest aggregation layer of the table;
- and
- outputting a user interface displaying an identification of the one or more conflicting data values in the suggested aggregation layer and one or more selections for resolving the one or more conflicting data values.
Dependencies are inferred from the claim text.