coilyco-flight-deck/ward
Archived
Watch
2
0
Code Issues Pull requests Projects Releases 820 Packages 1 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
Owner
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
Commenting is not possible because the repository is archived.
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

  
autonomy
async-consult
 A human needs to consult on the issue to upgrade it to headless

  
autonomy
epic
 This issue has many units of sub work - its size makes it meaningfully exclusive with other autonomy types

  
autonomy
headless
 The agent can perform the work on its own

  
autonomy
live-collab
 The agent and the human need to work together in realtime

  
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.

  
priority
P0
 priority tier

  
priority
P1
 priority tier

  
priority
P2
 priority tier

  
priority
P3
 priority tier

  
priority
P4
 priority tier

  
qa-fixture
Disposable issue admitted to the bounded Ward QA verification lane.

  
role/advocate
requires work from the Developer Advocate seat

  
role/director
requires work from the Portfolio Director seat

  
role/exec
requires work from the exec role

  
role/frontend
requires work from the Frontend Engineer seat

  
role/gamedev
requires work from the Game Developer seat

  
role/human
requires a person, and specifically not an agent seat

  
role/platform
requires work from the Platform Engineer seat

  
role/qa
requires work from the QA role

  
role/science
requires work from the Applied Scientist seat

  
role/sysadmin
requires work from the Systems Administrator seat

  
state
ambient
 ambient and ephemeral work, held as a maintained document rather than a queue

No labels
burndown-2026-06
pressure-test
sunday-sprint
autonomy
async-consult
autonomy
epic
autonomy
headless
autonomy
live-collab
coherence-core
priority
P0
priority
P1
priority
P2
priority
P3
priority
P4
qa-fixture
role/advocate
role/director
role/exec
role/frontend
role/gamedev
role/human
role/platform
role/qa
role/science
role/sysadmin
state
ambient
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
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.