公开(公告)号：US20110161376A1

公开(公告)日：2011-06-30

申请号：US12651114

申请日：2009-12-31

申请人： Mary L. Dickson ,  Wesley Gyure ,  Hao Q. La ,  Anne F. Ross

发明人： Mary L. Dickson ,  Wesley Gyure ,  Hao Q. La ,  Anne F. Ross

IPC分类号： G06F17/30

摘要： Embodiments of the present invention provide a method, system and computer program product for the automated merger of content in progeny of a primary file in a version control system. In one embodiment of the invention, the method can include establishing different segments of content in a primary file in a merger tool executing in memory by a processor of a host computer and associating each of the segments with a classification corresponding to a particular merger rule selected from amongst different merger rules. The method also can include parsing content in different progeny of the primary file and identifying changes in a parsed portion of the progeny corresponding to a specific one of the segments of the primary file. Finally, the method can include applying to the identified changes a merger rule corresponding to a classification associated with the specific one of the segments.

摘要翻译： 本发明的实施例提供了一种用于在版本控制系统中的主文件的子代中自动合并内容的方法，系统和计算机程序产品。 在本发明的一个实施例中，该方法可以包括在由主计算机的处理器在存储器中执行的合并工具中的主文件中建立不同的内容段，并将每个段与对应于所选择的特定合并规则的分类相关联 从不同的合并规则。 该方法还可以包括在主文件的不同子代中解析内容并识别与主文件的特定一个片段相对应的后代的解析部分中的变化。 最后，该方法可以包括对所识别的改变应用对应于与特定一个段相关联的分类的合并规则。