Automated file merging through content classification

A version control data processing system comprising:

• a host computer with processor and memory;
• an operating system executing in the host computer;
• a file editor operating through the operating system;
• and,
• a merge utility coupled to the file editor, the merge utility comprising program code that when executed by the processor of the host computer establishes a configuration record in fixed storage of the host computer for a primary file and stores in the configuration record a listing of different segments of content in the primary file, and an order in which the segments are to be processed during a merge operation and assigning a classification to each of the different segments in the configuration record for the primary file, creates a new file for holding merged content, associates each classification with a particular merger rule selected from amongst a plurality of different merger rules, parses content in different progeny of the primary file, identifies changes in a parsed portion of the progeny corresponding to specific ones of the segments of the primary file, locates in the configuration record, an order in which the specific ones of the segments in of the primary file are to be processed during a merge operation, and performs the merge operation on the segments by selecting each corresponding one of the specific ones of the segments of the primary file in the order located in the configuration record, and applies a merge rule that corresponds to a classification of the corresponding one of the specific ones of the segments specified in the configuration record so as to place a result of the application of the merge rule in the new file.

A computer program product comprising a non-transitory computer usable storage medium storing computer usable program code for automated merger of content in progeny of a primary file in a version control system, the computer program product comprising:

• computer usable program code for establishing a configuration record in fixed storage of a host computer for a primary file in a merger tool executing in memory by a processor of the host computer, storing in the configuration record a listing of different segments of content in the primary file, and an order in which the segments are to be processed during a merge operation and assigning a classification to each of the different segments in the configuration record for the primary file;
• computer usable program code for creating a new file for holding merged content;
• computer usable program code for associating each classification with a particular merger rule selected from amongst a plurality of different merger rules;
• computer usable program code for parsing content in different progeny of the primary file;
• computer usable program code for identifying changes in a parsed portion of the progeny corresponding to specific ones of the segments of the primary file;
• computer usable program code for locating in the configuration record, an order in which the specific ones of the segments in of the primary file are to be processed during a merge operation;
• and,
• computer usable program code for performing the merge operation on the segments by selecting each corresponding one of the specific ones of the segments of the primary file in the order located in the configuration record, and applying a merge rule that corresponds to a classification of the corresponding one of the specific ones of the segments specified in the configuration record so as to place a result of the application of the merge rule in the new file.