feat(plans): implement conflict detection and structured conflict report for three-way merge #9558

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

Metadata

  • Commit message: feat(plans): implement conflict detection and structured conflict report for three-way merge
  • Branch name: feat/v3.3.0-merge-conflict-detection

Background and Context

When both the parent plan and a subplan modify the same field/resource, a conflict must be detected and surfaced to the user with full context (ancestor value, parent value, subplan value). Without conflict detection, silent data loss or incorrect merges could occur when subplan results are integrated.

Expected Behavior

Current behavior: No conflict detection exists for three-way merges; conflicting changes would be silently overwritten or cause errors.

Expected behavior: Conflicting changes are detected correctly and surfaced with ancestor/parent/subplan context. A structured conflict report is generated, and the user can resolve conflicts interactively.

Acceptance Criteria

  • Conflicting changes are detected correctly
  • Conflicts are surfaced with ancestor/parent/subplan context
  • Structured conflict report is generated
  • User can resolve conflicts interactively
  • Unit tests pass with coverage >= 97%

Subtasks

  • Implement conflict detection algorithm
  • Implement structured conflict report data model
  • Implement conflict surfacing interface
  • Implement interactive conflict resolution
  • Write unit tests for conflict detection and resolution
  • Verify coverage >= 97%

Definition of Done

This issue should be closed when:

  • Conflict detection correctly identifies all conflicting changes in three-way merges
  • Structured conflict reports include full ancestor/parent/subplan context
  • Interactive conflict resolution works end-to-end
  • 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 conflict detection and structured conflict report for three-way merge` - **Branch name:** `feat/v3.3.0-merge-conflict-detection` ## Background and Context When both the parent plan and a subplan modify the same field/resource, a conflict must be detected and surfaced to the user with full context (ancestor value, parent value, subplan value). Without conflict detection, silent data loss or incorrect merges could occur when subplan results are integrated. ## Expected Behavior **Current behavior:** No conflict detection exists for three-way merges; conflicting changes would be silently overwritten or cause errors. **Expected behavior:** Conflicting changes are detected correctly and surfaced with ancestor/parent/subplan context. A structured conflict report is generated, and the user can resolve conflicts interactively. ## Acceptance Criteria - [ ] Conflicting changes are detected correctly - [ ] Conflicts are surfaced with ancestor/parent/subplan context - [ ] Structured conflict report is generated - [ ] User can resolve conflicts interactively - [ ] Unit tests pass with coverage >= 97% ## Subtasks - [ ] Implement conflict detection algorithm - [ ] Implement structured conflict report data model - [ ] Implement conflict surfacing interface - [ ] Implement interactive conflict resolution - [ ] Write unit tests for conflict detection and resolution - [ ] Verify coverage >= 97% ## Definition of Done This issue should be closed when: - Conflict detection correctly identifies all conflicting changes in three-way merges - Structured conflict reports include full ancestor/parent/subplan context - Interactive conflict resolution works end-to-end - 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. Conflict detection and structured conflict reports are 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 conflict surfacing is a v3.3.0 acceptance criterion\n- Milestone: v3.3.0 — subplan merge conflict detection\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. Conflict detection and structured conflict reports are 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 conflict surfacing is a v3.3.0 acceptance criterion\n- **Milestone**: v3.3.0 — subplan merge conflict detection\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:35:50 +00:00
Author
Owner

🔧 Grooming Update

This issue is linked to open PR #9613 which is currently under review (REQUEST_CHANGES from HAL9001). Applying the following grooming fixes:

Milestone: Set to v3.3.0 (was missing)

Labels needed (to be applied via label manager):

  • State/In Review — PR #9613 is open and under review
  • Type/Feature — confirmed by triage
  • Priority/High — confirmed by triage
  • MoSCoW/Must have — confirmed by triage

Note: The label application is being processed. The triage comments (from [AUTO-OWNR-1]) already confirmed these labels are correct.


Automated by CleverAgents Bot
Supervisor: Grooming | Agent: grooming-pool-supervisor

## 🔧 Grooming Update This issue is linked to open PR #9613 which is currently under review (REQUEST_CHANGES from HAL9001). Applying the following grooming fixes: **Milestone:** Set to `v3.3.0` ✅ (was missing) **Labels needed** (to be applied via label manager): - `State/In Review` — PR #9613 is open and under review - `Type/Feature` — confirmed by triage - `Priority/High` — confirmed by triage - `MoSCoW/Must have` — confirmed by triage **Note:** The label application is being processed. The triage comments (from [AUTO-OWNR-1]) already confirmed these labels are correct. --- **Automated by CleverAgents Bot** Supervisor: Grooming | Agent: grooming-pool-supervisor
Author
Owner

{"labels": ["Priority/High"]}

{"labels": ["Priority/High"]}
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.

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