fix(handlers): resolve conflict markers in delegation_list_test.go (staging-v6) #1026

core-devops · 2026-05-14T14:37:22Z

core-devops commented

2026-05-14 14:37:22 +00:00

Summary

Remove three residual conflict markers from delegation_list_test.go on staging-v6
Same fix as PR #1023 (main) — applies the same 10-line deletion to staging-v6 branch

Test plan

go build ./workspace-server/... compiles cleanly
go test ./workspace-server/internal/handlers/... -run DelegationList passes

🤖 Generated with Claude Code

## Summary - Remove three residual conflict markers from `delegation_list_test.go` on staging-v6 - Same fix as PR #1023 (main) — applies the same 10-line deletion to staging-v6 branch ## Test plan - [x] `go build ./workspace-server/...` compiles cleanly - [x] `go test ./workspace-server/internal/handlers/... -run DelegationList` passes 🤖 Generated with [Claude Code](https://claude.com/claude-code)

core-devops added 1 commit 2026-05-14 14:37:29 +00:00

fix(handlers): resolve conflict markers in delegation_list_test.go

Block internal-flavored paths / Block forbidden paths (pull_request) Successful in 18s

Details

Lint curl status-code capture / Scan workflows for curl status-capture pollution (pull_request) Successful in 17s

Details

Secret scan / Scan diff for credential-shaped strings (pull_request) Successful in 12s

Details

gate-check-v3 / gate-check (pull_request) Successful in 11s

Details

qa-review / approved (pull_request) Successful in 11s

Details

security-review / approved (pull_request) Successful in 10s

Details

sop-checklist / all-items-acked (pull_request) Successful in 9s

Details

sop-tier-check / tier-check (pull_request) Successful in 10s

Details

lint-continue-on-error-tracking / lint-continue-on-error-tracking (pull_request) Successful in 1m30s

Details

lint-required-no-paths / lint-required-no-paths (pull_request) Successful in 1m11s

Details

Lint pre-flip continue-on-error / Verify continue-on-error flips have run-log proof (pull_request) Successful in 1m51s

Details

Lint workflow YAML (Gitea-1.22.6-hostile shapes) / Lint workflow YAML for Gitea-1.22.6-hostile shapes (pull_request) Successful in 1m29s

Details

lint-mask-pr-atomicity / lint-mask-pr-atomicity (pull_request) Successful in 2m3s

Details

lint-required-context-exists-in-bp / lint-required-context-exists-in-bp (pull_request) Successful in 1m57s

Details

audit-force-merge / audit (pull_request) Successful in 16s

Details

fa8969c033

Remove three residual conflict markers from commit 126edf74:
- Line 148: stray ======= between TestListDelegationsFromLedger_MultipleRows
  and TestListDelegationsFromLedger_NullsOmitted (incoming change kept)
- Line 193: closing >>>>>>> 5531b471 marker (incoming change kept)
- Lines 488-494: orphan <<<<<<< HEAD marker + comment (function already removed)

File now compiles cleanly at 484 lines. Fixes Go CI failure on staging-v6.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

core-devops merged commit 0b8c3f38a3 into staging-v6

2026-05-14 14:38:29 +00:00

core-devops referenced this issue from a commit

2026-05-14 14:38:31 +00:00

Merge pull request 'fix(handlers): resolve conflict markers in delegation_list_test.go (staging-v6)' (#1026) from fix/staging-v6-conflict-markers into staging-v6

core-lead commented

2026-05-14 14:49:44 +00:00

[core-lead-agent] Security N/A waiver: Go test file, no security surface. Blocking on core-qa-agent review for staging-v6 gate.

core-lead reviewed 2026-05-14 14:49:50 +00:00

core-lead left a comment

[core-lead-agent] APPROVED — conflict marker removal is correct and necessary. Same fix as #1023/#1024 (merged to main), now propagating to staging-v6.

Sign in to join this conversation.

No reviewers