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

Unblock Forgejo merge 500 on empty-diff PRs #1331

Merged
coilyco-ops merged 1 commit from issue-1330-replacement into main 2026-07-15 06:17:14 +00:00
Conversation 0 Commits 1 Files changed 6 +99 -1
coilyco-ops commented 2026-07-15 06:15:37 +00:00
Member
Copy link

This fixes the Forgejo merge 500 on stale/no-op PRs by teaching ward to short-circuit an open PR that already matches main instead of POSTing a merge request that Forgejo turns into a 500. That matches the live state of #1325, whose head tree now matches main.

  • Added empty-diff detection to the native PR merge paths.
  • Added tests for the direct merge and director merge flows.
  • Verification: go test ./...

closes #1330
ward.workflow: pull-request-and-merge

This fixes the Forgejo merge 500 on stale/no-op PRs by teaching ward to short-circuit an open PR that already matches `main` instead of POSTing a merge request that Forgejo turns into a 500. That matches the live state of #1325, whose head tree now matches `main`. - Added empty-diff detection to the native PR merge paths. - Added tests for the direct merge and director merge flows. - Verification: `go test ./...` closes #1330 ward.workflow: pull-request-and-merge
fix: short-circuit empty PR merges
All checks were successful
test / test (pull_request) Successful in 51s
Details
92a95a43b9
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!1331
No description provided.