CONFLICT RESOLUTION FOR DATABASE FILE MERGE
First Claim
1. 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, and detect 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 at the database by another user that also has privileges to update the database file; and
an output configured to output a user interface displaying an identification of the one or more conflicting data values and one or more selections for automatically resolving the one or more conflicting data values at the database.
1 Assignment
0 Petitions
Accused Products
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.
-
Citations
20 Claims
-
1. 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, and detect 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 at the database by another user that also has privileges to update the database file; and an output configured to output a user interface displaying an identification of the one or more conflicting data values and one or more selections for automatically resolving the one or more conflicting data values at the database. - View Dependent Claims (2, 3, 4, 5, 6, 7, 8)
-
-
9. 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 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 at the database 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 automatically resolving the one or more conflicting data values at the database. - View Dependent Claims (10, 11, 12, 13, 14, 15, 16)
-
-
17. 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 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 at the database 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. - View Dependent Claims (18, 19, 20)
-
Specification