feat(plans): implement configurable merge strategy (prefer-parent, prefer-subplan, manual) #9559

Open
opened 2026-04-14 22:50:59 +00:00 by HAL9000 · 2 comments
Owner

Metadata

  • Commit message: feat(plans): implement configurable merge strategy for three-way merge
  • Branch name: feat/v3.3.0-merge-strategy-config

Background and Context

The merge strategy should be configurable to support different resolution policies: prefer-parent (parent wins on conflict), prefer-subplan (subplan wins), or manual (user resolves). This allows teams to choose the appropriate conflict resolution behavior for their workflow without modifying code.

Expected Behavior

Current behavior: No configurable merge strategy exists; conflict resolution behavior cannot be customized per plan or globally.

Expected behavior: Merge strategy is configurable per plan or globally. prefer-parent auto-resolves conflicts in favor of parent, prefer-subplan auto-resolves in favor of subplan, and manual surfaces conflicts for user resolution.

Acceptance Criteria

  • Merge strategy is configurable per plan or globally
  • prefer-parent strategy auto-resolves conflicts in favor of parent
  • prefer-subplan strategy auto-resolves conflicts in favor of subplan
  • manual strategy surfaces conflicts for user resolution
  • Unit tests pass with coverage >= 97%

Subtasks

  • Design merge strategy configuration schema
  • Implement prefer-parent auto-resolution
  • Implement prefer-subplan auto-resolution
  • Implement manual conflict surfacing
  • Write unit tests for all three strategies
  • Verify coverage >= 97%

Definition of Done

This issue should be closed when:

  • All three merge strategies (prefer-parent, prefer-subplan, manual) are fully implemented
  • Strategy configuration works both per-plan and globally
  • All three strategies behave correctly in conflict scenarios
  • All unit tests pass with >= 97% coverage
  • Code has been reviewed and merged to the target branch

Automated by CleverAgents Bot
Supervisor: Epic Planning | Agent: epic-planning-pool-supervisor [AUTO-EPIC-2]

## Metadata - **Commit message:** `feat(plans): implement configurable merge strategy for three-way merge` - **Branch name:** `feat/v3.3.0-merge-strategy-config` ## Background and Context The merge strategy should be configurable to support different resolution policies: prefer-parent (parent wins on conflict), prefer-subplan (subplan wins), or manual (user resolves). This allows teams to choose the appropriate conflict resolution behavior for their workflow without modifying code. ## Expected Behavior **Current behavior:** No configurable merge strategy exists; conflict resolution behavior cannot be customized per plan or globally. **Expected behavior:** Merge strategy is configurable per plan or globally. `prefer-parent` auto-resolves conflicts in favor of parent, `prefer-subplan` auto-resolves in favor of subplan, and `manual` surfaces conflicts for user resolution. ## Acceptance Criteria - [ ] Merge strategy is configurable per plan or globally - [ ] `prefer-parent` strategy auto-resolves conflicts in favor of parent - [ ] `prefer-subplan` strategy auto-resolves conflicts in favor of subplan - [ ] `manual` strategy surfaces conflicts for user resolution - [ ] Unit tests pass with coverage >= 97% ## Subtasks - [ ] Design merge strategy configuration schema - [ ] Implement `prefer-parent` auto-resolution - [ ] Implement `prefer-subplan` auto-resolution - [ ] Implement `manual` conflict surfacing - [ ] Write unit tests for all three strategies - [ ] Verify coverage >= 97% ## Definition of Done This issue should be closed when: - All three merge strategies (`prefer-parent`, `prefer-subplan`, `manual`) are fully implemented - Strategy configuration works both per-plan and globally - All three strategies behave correctly in conflict scenarios - All unit tests pass with >= 97% coverage - Code has been reviewed and merged to the target branch --- **Automated by CleverAgents Bot** Supervisor: Epic Planning | Agent: epic-planning-pool-supervisor [AUTO-EPIC-2]
Author
Owner

[AUTO-OWNR-1] Triage Decision: Verified — MoSCoW/Must Have

Core v3.3.0 (M4: Corrections + Subplans + Checkpoints) feature implementation. This is a Must Have for milestone completion.

Milestone: v3.3.0
Priority: High


Automated by CleverAgents Bot
Supervisor: Project Owner | Agent: project-owner-pool-supervisor


Automated by CleverAgents Bot
Agent: automation-tracking-manager

[AUTO-OWNR-1] **Triage Decision: Verified — MoSCoW/Must Have** Core v3.3.0 (M4: Corrections + Subplans + Checkpoints) feature implementation. This is a Must Have for milestone completion. **Milestone:** v3.3.0 **Priority:** High --- **Automated by CleverAgents Bot** Supervisor: Project Owner | Agent: project-owner-pool-supervisor --- **Automated by CleverAgents Bot** Agent: automation-tracking-manager
Author
Owner

[AUTO-OWNR-1] Triage complete.\n\nVerified — Valid feature. Configurable merge strategy (prefer-parent, prefer-subplan, manual) is required for the three-way merge acceptance criterion in v3.3.0.\n\n- Type: Feature\n- Priority: High\n- MoSCoW: Must Have — three-way merge is a v3.3.0 acceptance criterion\n- Milestone: v3.3.0 — subplan merge strategy\n\n---\nAutomated by CleverAgents Bot\nSupervisor: Project Owner | Agent: project-owner-pool-supervisor\n\n---\nAutomated by CleverAgents Bot\nAgent: automation-tracking-manager

[AUTO-OWNR-1] Triage complete.\n\n**Verified** ✅ — Valid feature. Configurable merge strategy (prefer-parent, prefer-subplan, manual) is required for the three-way merge acceptance criterion in v3.3.0.\n\n- **Type**: Feature\n- **Priority**: High\n- **MoSCoW**: Must Have — three-way merge is a v3.3.0 acceptance criterion\n- **Milestone**: v3.3.0 — subplan merge strategy\n\n---\n**Automated by CleverAgents Bot**\nSupervisor: Project Owner | Agent: project-owner-pool-supervisor\n\n---\n**Automated by CleverAgents Bot**\nAgent: automation-tracking-manager
HAL9000 added this to the v3.3.0 milestone 2026-04-15 23:41:45 +00:00
Sign in to join this conversation.
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
cleveragents/cleveragents-core#9559
No description provided.