File tree conflict processor
US7165248B2 · kind B2 · utility
Assignee
Inventors
Key dates
| Filing date | Dec 12, 2001 |
| Grant date | Jan 16, 2007 |
| Priority date | — |
| Expiry date | Jan 22, 2024 |
Classification
- Technology area (CPC Y)Emerging Cross-Sectional Technologies
- CPC primaryY10S707/99938
- WIPO fieldComputer technology
- WIPO sectorElectrical engineering
Abstract
The embodiments of the present invention provide a method for resolving conflicting changes encountered when reconciling parallel user changes to two synchronized trees of folders and files. According to one embodiment, these conflicts are presented to the user as an interface that requires an indication from the user to the winner of the conflict. According to another embodiment, since certain conflicts cannot be resolved independently, they have to be combined and presented to the user as a single conflict. According to yet another embodiment, after the user has indicated which operations are the winners of all or some of the conflicts, the winning operations are applied to the file tree with which they are in conflict.
Source: USPTO / EPO open patent data. Objective bibliographic and citation counts.