Patent ID: 8635588

Claim:
A method for reconciling software source code, comprising: retrieving a first file of generated source code, a first portion of the first file of generated source code having at least a first reconciliation tag, a first start index, and a first stop index associated therewith, the first start index and the first stop index indicating a position and an extent of the first portion; retrieving a modified file of source code corresponding to the first file of generated source code with at least a first user modification in a modified portion of the modified file of source code; retrieving a second file of generated source code, a second portion of the second file of generated source code having a second reconciliation tag, a second start index, and a second stop index associated therewith, the second reconciliation tag having a name identical to a name of the first reconciliation tag, the second start index and the second stop index indicating a position and an extent of the second portion; analyzing the first file of generated source code and the modified file of source code to determine if the modified portion of the modified file of source code logically corresponds to the first portion of source code linked to the first reconciliation tag; if the modified portion of the modified file of source code logically corresponds to the first portion of source code linked to the first reconciliation tag, then reconciling the first file of generated source code, the modified file of source code, and the second file of generated source code by generating a reconciled file of source code that has source code corresponding to the first user modification being applied in the second portion of the second file of generated source code, utilizing the second reconciliation tag, the second start index, the second stop index; storing the reconciled file of source code in a memory device; determining that the second file of generated source code cannot be reconciled with the first file of generated source code and the modified file of source code when the second file of generated source code does not have a reconciliation tag having a name corresponding to a name of the first reconciliation tag; and based on determining that the second file of generated source code cannot be reconciled with the first file of generated source code and the modified file of source code, generating an error message indicating that the first user modification cannot be reconciled with the second file of generated source code and storing the error message in a memory device.