Method for performing conditionalized N-way merging of source code
US8719786B2 · kind B2 · utility
4Cited by
16References
17Claims
0Family size
Assignee
Inventor
Key dates
| Filing date | Mar 30, 2005 |
| Grant date | May 6, 2014 |
| Priority date | — |
| Expiry date | Sep 15, 2031 |
Classification
- Technology area (CPC G)Physics
- CPC primaryG06F8/71
- WIPO fieldComputer technology
- WIPO sectorElectrical engineering
Abstract
A method combines N versions of a C/C++ program into a single, semantically correct, unified program, while maintaining the semantics of each version within N. The problem of merge conflicts is avoided by conditionalizing changes that potentially conflict, according to a set of preprocessors definitions that uniquely define the version within N. Conditionalization is realized through C/C++ preprocessing directives (e.g., #if, #else, #elif).
Source: USPTO / EPO open patent data. Objective bibliographic and citation counts.