摘要 |
A method, and associated computer system and computer program product, of detecting source code merge conflicts and compilation errors. Uncommitted changes associated with a source code are received periodically at each time of a sequence of times. A temporary branch corresponding to each uncommitted change associated with the source code is created. The temporary branch corresponding to each uncommitted change is merged to corresponding portions of the source code. It is ascertained that no merge conflict resulted from the merging and in response, a compilation of a merged version of the source code is performed, wherein the merged version of the source code includes the temporary branch corresponding to each uncommitted change. It is determined that no compilation error occurred from the compilation and in response, a version of a product that includes the merged version of the source code is created. |
主权项 |
1. A method of detecting source code merge conflicts and compilation errors, the method comprising:
receiving, periodically by one or more processors of a computer system, a plurality of uncommitted changes associated with a source code; creating, by the one or more processors, a temporary branch corresponding to each uncommitted change associated with the source code; merging, by the one or more processors, the temporary branch corresponding to each uncommitted change to corresponding portions of the source code; ascertaining, by the one or more processors, that no merge conflict resulted from said merging and in response, performing a compilation, by the one or more processors, of a merged version of the source code, said merged version of the source code comprising the temporary branch corresponding to each uncommitted change; and determining, by the one or more processors, that no compilation error occurred from the compilation and in response, creating, by the one or more processors, a version of a product that includes the merged version of the source code. |