Patent ID: 7251669

Claim:
A method for conflict resolution in a versioned database, the method comprising: generating a set of three separate versioned tables for a corresponding version of the database, the set of three separate versioned tables comprising a version insert table, a version delete table, and a version modify table, whereby each data element that is inserted in the corresponding version is stored in the version insert table, each data element that is deleted in the corresponding version is stored in the version delete table, and each data element that is modified in the corresponding version is stored in the version modify table; storing a changed data element and a corresponding timestamp of a base table in one of the versioned tables; submitting the changed data element to the base table; if the stored timestamp is equal to a current timestamp of the base table, committing the changed data element to the base table; and if the stored timestamp is not equal to a current timestamp of the base table, generating an alert indicating that a conflict is present.