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

Prevent redundant PR merge after landing #1361

Merged
coilyco-ops merged 1 commit from issue-1358 into main 2026-07-15 09:01:50 +00:00
Conversation 0 Commits 1 Files changed 4 +180 -3
coilyco-ops commented 2026-07-15 08:58:03 +00:00
Member
Copy link

closes #1358

ward.workflow: pull-request-and-merge

Added an early no-op guard in the PR merge path so workers stop when Forgejo already reports the PR merged or when the PR head tree already matches the base branch tree.

  • Shared the guard between the worker merge path and the director merge lane.
  • Added commit-tree lookups for Forgejo commits and regression tests for already-merged and same-tree-after-merge cases.
  • Verified with go test ./....
closes #1358 ward.workflow: pull-request-and-merge Added an early no-op guard in the PR merge path so workers stop when Forgejo already reports the PR merged or when the PR head tree already matches the base branch tree. - Shared the guard between the worker merge path and the director merge lane. - Added commit-tree lookups for Forgejo commits and regression tests for already-merged and same-tree-after-merge cases. - Verified with `go test ./...`.
Prevent redundant PR merge after landing
All checks were successful
test / test (pull_request) Successful in 2m14s
Details
37d9016604 
closes #1358
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
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
coilyco-flight-deck/ward!1361
No description provided.