molecule-ai/molecule-core
41
0
Fork 2
Code Issues 66 Pull Requests 45 Actions 363 Packages Projects Releases Wiki Activity

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

Merged
core-devops merged 1 commits from fix/staging-v6-conflict-markers into staging-v6 2026-05-14 14:38:29 +00:00
Conversation 1 Commits 1 Files Changed 1 -10

1 Commits

Author SHA1 Message Date
Molecule AI Core-DevOps
fa8969c033 fix(handlers): resolve conflict markers in delegation_list_test.go
All checks were successful
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 
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>
 2026-05-14 14:36:59 +00:00