Calling a plugin and using a merging policy for mitigating version conflicts
US12417343B2 · kind B2 · utility
Assignee
Inventors
Key dates
| Filing date | Nov 28, 2023 |
| Grant date | Sep 16, 2025 |
| Priority date | — |
| Expiry date | Jun 3, 2044 |
Classification
- Technology area (CPC G)Physics
- CPC primaryG06F9/44526
- WIPO fieldComputer technology
- WIPO sectorElectrical engineering
Abstract
A computer-implemented method, according to one approach, includes performing a predetermined first data merge process in response to a determination that a version conflict exists between a plurality of versions of a data file resulting from editing performed on different cloud devices. The predetermined first data merge process includes determining a first merging policy of the data file from a plurality of potential merging policies, determining a plugin associated with the data file, and calling the plugin. The first merging policy is used as an input for the plugin, and the plugin includes predetermined conditions for determining first contents of the versions of the data file to exclude from a merge operation performed on the data file and second contents of the versions of the data file to include in the merge operation.
Source: USPTO / EPO open patent data. Objective bibliographic and citation counts.