coilyco-flight-deck/ward
2
0
Fork 0
Code Issues 105 Pull requests Projects Releases 737 Packages Wiki Activity Actions

Repair ward PR merge queue blocked by base-branch conflicts #1063

Merged
coilysiren merged 3 commits from issue-1057 into main 2026-07-10 18:00:18 +00:00
Conversation 1 Commits 3 Files changed 3 +105 -3
coilyco-ops commented 2026-07-10 17:45:58 +00:00
Member
Copy link

closes #1057

ward.workflow: pull-requests-and-merge

closes #1057 ward.workflow: pull-requests-and-merge
fix(director): classify merge-conflict skips
Some checks failed
test / test (pull_request) Failing after 2m29s
Details
fed6795ef3
Merge branch 'main' into issue-1057
Some checks failed
test / test (pull_request) Has been cancelled
Details
beeae8150e
test(ci): stabilize config source coverage
All checks were successful
test / test (pull_request) Successful in 36s
Details
b947385f8d
coilyco-ops commented 2026-07-10 18:13:10 +00:00
Author
Member
Copy link

Folded under the resilience epic #1069 - merge-queue base-branch conflict repair generalizes into work item 3 (real merge queue)

Folded under the resilience epic #1069 - merge-queue base-branch conflict repair generalizes into work item 3 (real merge queue)
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
burndown-2026-06
Backlog burndown June 2026

  
pressure-test
Cold-read release pressure-test findings and coordination

  
sunday-sprint
Burn-down by Sunday 2026-06-07

  
coherence-core
Core review set for the warded control plane coherence milestone. These issues form the release spine; adjacent milestone issues are stretch or supporting work.

  
consult
A human decision, design, or external action must happen first. Fail-closed default for unlabeled/low-confidence.

  
headless
Agent can take it from open issue to merged change with no human in the loop. The auto-burndown queue.

  
interactive
Agent does the work but pauses at a human checkpoint mid-flight (design choice, destructive step, human-only verification).

  
P0
now / blocking / urgent

  
P1
next / important

  
P2
backlog / will do

  
P3
someday / low

  
P4
icebox / frozen / reopen if it becomes real

No labels
burndown-2026-06
pressure-test
sunday-sprint
coherence-core
consult
headless
interactive
P0
P1
P2
P3
P4
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
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
coilyco-flight-deck/ward!1063
No description provided.