Modular Document Merge Definition for Automated Conflict Resolution
Find Innovative SolutionsGenerate Solutions
Solution Overview
Problem
Conventional methods for merging multiple versions of modular documents are inefficient due to the need for manual conflict resolution, which can be tedious and time-consuming, especially in large documents with many conflicts.
Innovation Solution
Incorporating a merge definition into the modular document that specifies how conflicts are resolved, using timestamps or hierarchical user levels to determine which version to prioritize, allowing for automated conflict resolution on a per-document basis.
Engineering Contradictions & Design Principles
Engineering Contradiction Analysis
1Reliability
If manual conflict resolution is used during document merging, then conflict resolution can be performed, but the process becomes tedious and time-consuming
Solution Approach 1:
The patent applies preliminary action by embedding merge definitions within the modular document structure before the merging process occurs. These definitions pre-specify conflict resolution rules (such as timestamp-based or hierarchy-based resolution) so that when conflicts arise during merging, they can be automatically resolved without requiring manual intervention, thereby reducing merging time while maintaining reliable conflict resolution
Solution Approach 2:
The patent implements self-service by enabling the modular document to resolve its own conflicts automatically through embedded merge definitions. The document structure includes metadata and rules that allow it to independently determine which version of conflicting components to retain, eliminating the need for external manual conflict resolution and significantly reducing the time required for merging operations
2Productivity
If automated conflict resolution is implemented, then merging efficiency is improved, but the system complexity increases
Solution Approach 1:
The patent applies segmentation by dividing the conflict resolution system into modular components: the modular document structure is segmented into components with embedded metadata, and conflict resolution is segmented into specific rules (timestamp-based, hierarchy-based) that can be independently applied to different components. This modular approach enables automated conflict resolution and improves merging efficiency while managing system complexity through organized, reusable segments
Solution Approach 2:
The patent utilizes parameter changes by incorporating metadata parameters (timestamps, user hierarchy levels) into the modular document structure. These parameters provide the automated conflict resolution system with the information needed to make intelligent decisions about which versions to retain, thereby improving merging efficiency without requiring complex artificial intelligence, as the complexity is managed through structured parameter comparison
3Extent of automation
If merge definitions are embedded in the modular document, then automated conflict resolution is enabled, but the document structure becomes more complex
Solution Approach 1:
The patent applies merging by combining the conflict resolution definitions with the modular document structure itself. The merge definitions, metadata, and resolution rules are integrated directly into the document's component structure, allowing automated conflict resolution to be enabled without requiring separate external systems. This integration achieves high automation while managing complexity by unifying the document structure and conflict resolution mechanisms into a single coherent system
Data Source
AI summary
A first instance of a modular document is received, where the modular document is composed of plural parts, and where the modular document contains a merge definition. A second instance of the modular document is received, where the second instance and the first instance of the modular document have been modified with respect to each other. The second instance is merged with the first instance, where any conflict between the second instance and the first instance is resolved according to the merge definition.