Release Branch Code Merging with Ancestor Conflict Resolution

Resolve Bottlenecks,
Find Innovative SolutionsGenerate Solutions

Solution Overview

Problem

Existing code development systems face challenges in managing multiple branches of code, leading to difficulties in ensuring that different branches have appropriate versions of code and propagating code changes across branches efficiently.

Innovation Solution

A system and method for automatically merging versions of code with ancestor and descendant versions, which includes determining conflicts and resolving them, ensuring mergeability across multiple versions, and propagating changes across branches.

Engineering Contradictions & Design Principles

VSEngineering Contradiction Analysis

1Productivity

If code is developed within a single active branch to maintain version consistency, then code version control is simplified, but aggressive product development cycles and timelines cannot be met

Engineering Contradiction:

Improveproduct development speedVSAvoidbranch management complexity

Core Design Contradiction:

ProductivityVSDevice complexity

Solution Approach 1:

The patent divides the codebase into multiple parallel branches (e.g., main branch, development branches) that can be developed simultaneously. Each branch represents a segmented portion of the overall codebase that can progress independently, enabling aggressive development cycles while maintaining version control through the branching structure.

Inventive Principle:

Principle #1Segmentation

Solution Approach 2:

The system performs preliminary actions by automatically detecting conflicts before they become problematic and resolving them in advance. The conflict detection and resolution mechanisms operate proactively to ensure that multiple branches can be merged without issues, enabling parallel development without compromising code integrity.

Inventive Principle:

Principle #10Preliminary action

2Productivity

If multiple branches are used to facilitate parallel development, then aggressive development cycles are met, but ensuring appropriate code versions across branches becomes difficult

Engineering Contradiction:

Improveparallel development efficiencyVSAvoidcode version consistency

Core Design Contradiction:

ProductivityVSReliability

Solution Approach 1:

The system implements continuous feedback mechanisms that automatically detect conflicts between branches and provide information about version inconsistencies. This feedback loop enables the system to identify and resolve version control issues before they affect code reliability, maintaining consistency across multiple parallel branches.

Inventive Principle:

Principle #23Feedback

Solution Approach 2:

The conflict resolution system operates autonomously to maintain code version consistency across branches. The automatic detection and resolution mechanisms serve the system itself by proactively managing version control without requiring external intervention, ensuring reliability while enabling parallel development.

Inventive Principle:

Principle #25Self-service

3Loss of time

If manual conflict resolution is used between branches, then code merging can be controlled, but time is lost in detecting and resolving conflicts

Engineering Contradiction:

Improveconflict resolution timeVSAvoidmanual conflict management effort

Core Design Contradiction:

Loss of timeVSEase of operation

Solution Approach 1:

The system performs self-service by automatically detecting and resolving conflicts between branches without requiring manual intervention. The autonomous conflict resolution process eliminates time losses associated with manual conflict detection and resolution, while the system manages the complexity internally rather than requiring user effort.

Inventive Principle:

Principle #25Self-service

Solution Approach 2:

The system performs preliminary conflict detection and resolution before merges are attempted. By proactively identifying and resolving potential conflicts in advance, the system prevents time losses during actual merge operations and eliminates the need for manual conflict management effort.

Inventive Principle:

Principle #10Preliminary action

4Reliability

If code changes are propagated across multiple branches, then all versions remain up-to-date, but conflicts arise that prevent merging

Engineering Contradiction:

Improvecode version currencyVSAvoidmerge conflicts

Core Design Contradiction:

ReliabilityVSObject-generated harmful factors

Solution Approach 1:

The system applies preliminary anti-action by detecting potential conflicts before they occur and resolving them in advance. The conflict detection mechanisms identify changes that would create merge conflicts and address them proactively, preventing the harmful effects of conflicts while maintaining code currency across all branches.

Inventive Principle:

Principle #9Preliminary anti-action

Solution Approach 2:

The system uses feedback mechanisms to monitor code changes across branches and provide real-time information about potential conflicts. This continuous feedback enables the system to maintain code version currency while automatically resolving conflicts before they prevent merging, eliminating the harmful effects of unmanaged conflicts.

Inventive Principle:

Principle #23Feedback

Data Source

PatentUS12346688B1Merging code through multiple release branches

Publication Date: 2025.07.01 WORKDAY INC

AI summary

The present application discloses a method, system, and computer system for managing versions of code. The method includes obtaining a first version of a code, determining whether the first version of the code creates a first conflict with respect to an ancestor version of the code, wherein the ancestor version of the code comprises a set of code that has a dependency relationship on another version of the code, in response to determining that the first version of the code creates the first conflict with respect to the ancestor version of the code, cause the first conflict to be resolved.