Changeset conflict rebasing
US11144309B2 · kind B2 · utility
0Cited by
4References
15Claims
0Family size
Assignee
Inventors
Key dates
| Filing date | Jul 19, 2019 |
| Grant date | Oct 12, 2021 |
| Priority date | — |
| Expiry date | Jul 19, 2039 |
Classification
- Technology area (CPC H)Electricity
- CPC primaryH04L67/02
- WIPO fieldComputer technology
- WIPO sectorElectrical engineering
Abstract
In example embodiments, techniques are provided to implement changeset conflict rebasing when performing conflict-detection and merging in an infrastructure modeling software architecture that uses an optimistic concurrency policy. Changeset conflict rebasing involves adjusting the pre-change values in a local changeset so they match post-change values of a remote version, rather an original base version, or removing changes from the local changeset entirely.
Source: USPTO / EPO open patent data. Objective bibliographic and citation counts.