MERGING VERSIONS OF AN INCLUSION APPLICATION THAT IS INCORPORATED INTO A MASTER APPLICATION

摘要

Techniques for merging versions of an inclusion application that is incorporated in a master application are disclosed. One version of an application may be stored as an application that is incorporated into another application. An application that is incorporated into another application may be referred to as an “inclusion application.” An application incorporating another application may be referred to as a “master application.” Additionally, a different version of the application may be stored as an application that is executed independently, without reference to other applications. A merging engine applies a set of conflict resolution rules to the two versions of the application to obtain a merged version of the application. The merging engine incorporates the merged version of the application in the master application.

主权项

1. A non-transitory computer readable medium comprising instructions which, when executed by one or more hardware processors, causes performance of operations comprising:
identifying a first version of a master application comprising a first version of an inclusion application; identifying a modified version of the inclusion application generated at least by modifying each of a first asset and a second asset of the first version of the inclusion application; identifying a customized version of the master application, wherein:
the customized version of the master application includes a customized version of the inclusion application,the customized version of the inclusion application is generated at least by customizing the second asset of the first version of the inclusion application without customizing the first asset of the first version of the inclusion application,the second asset of the customized version of the inclusion application is different than the second asset of the modified version of the inclusion application; generating a merged version of the inclusion application, including (a) the first asset from the modified version of the inclusion application, and (b) the second asset from the customized version of the inclusion application; and generating a modified version of the master application including the merged version of the inclusion application.