Patent ID: 9535969
Date: 2017-01-03
CPC Classifications: G06F

Claim:
1. A computer-implemented method for conflict-free two-way synchronization between a primary repository and a secondary repository the method comprising: receiving a child revision associated with a parent revision in the secondary repository, the parent revision being pointed to by a second user-visible reference in the secondary repository; storing a hidden reference to the child revision in a temporary storage area in the secondary repository; identifying a first user-visible reference in the primary repository that corresponds to the second user-visible reference in the secondary repository and points to a revision in the primary repository; comparing the revision to which the first user-visible reference in the primary repository points with the revision to which the second user-visible reference in the secondary repository points; responsive to determining that the revision to which the second user-visible reference points in the secondary repository is a copy of the revision to which the first user-visible reference points in the primary repository, pushing the child revision from the secondary repository to the primary repository so that the primary repository includes a copy of the child revision from the secondary repository; and updating the first user-visible reference in the primary repository to point to the copy of the child revision in the primary repository.