Method and apparatus for merging a plurality of software code change versions
US12001838B2 · kind B2 · utility
Assignee
Inventors
Key dates
| Filing date | Jun 28, 2022 |
| Grant date | Jun 4, 2024 |
| Priority date | — |
| Expiry date | Sep 29, 2042 |
Classification
- Technology area (CPC G)Physics
- CPC primaryG06F11/3604
- WIPO fieldComputer technology
- WIPO sectorElectrical engineering
Abstract
A method for merging a plurality of software code change versions, where a merging apparatus may first analyze code change areas in a software code preliminarily merged version and two different software code change versions. After change intents of the two code change areas are determined, the merging apparatus eliminates, based on a conflict elimination rule set and the change intents of the two code change areas, a conflict block in the software code preliminarily merged version.
Source: USPTO / EPO open patent data. Objective bibliographic and citation counts.