SAP SE
Static analysis of higher-order merge conflicts in large software development projects

Abstract:

A method, a system, and a computer program product for detection of potential merge conflicts. One or more changes to one or more source code entries in a software application are received. One or more dependency relationships of the received changes to one or more source code entries are determined and analyzed. A data structure including at least one node corresponding to the received changes is generated. Using the dependency relationships and the generated data structure, one or more conflicting changes are identified.