Skip to main content

Batch Edit Merge

2 requirements · 5 scenarios

Two-Phase Progressive Merge

JR-batch-edit-merge-001
The batch edit merger SHALL apply non-conflicting opcodes immediately (Phase 1) and defer conflicting opcodes to asynchronous LLM resolution (Phase 2), emitting an interim draft between phases.
3 test scenarios
  • No conflicts — single phase JR-batch-edit-merge-001.1
  • Conflicts exist — two phases JR-batch-edit-merge-001.2
  • Transitive dependency deferral JR-batch-edit-merge-001.3

Conflict Paragraph Shimmer

JR-batch-edit-merge-004
The frontend contract pane SHALL display a shimmer/pulse animation on paragraphs with pending conflict resolution, and remove it when resolution completes.
2 test scenarios
  • Shimmer applied on interim draft JR-batch-edit-merge-004.1
  • Shimmer removed on final draft JR-batch-edit-merge-004.2