首页>
外国专利>
Method for performing conditionalized N-way merging of source code
Method for performing conditionalized N-way merging of source code
展开▼
机译:源代码的有条件的n路合并的方法
展开▼
页面导航
摘要
著录项
相似文献
摘要
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).
展开▼
机译:一种方法将N个版本的C / C ++程序合并到一个在语义上正确的统一程序中,同时将每个版本的语义保持在N个以内。合并冲突的问题是通过条件化潜在冲突的条件避免的。在N中唯一定义版本的预处理器定义。条件化是通过C / C ++预处理指令(例如,#if,#else,#elif)实现的。
展开▼