[CI] dashpay/dash#7173 — predict_conflicts fail: merge conflict in non-backported.txt

[thepastaclaw]

Summary

PR: dashpay/dash#7173 (ci: add fuzz regression testing and continuous fuzzing infrastructure)
Check: predict_conflicts
Status: FAIL — merge state BLOCKED
Run: https://github.com/dashpay/dash/actions/runs/22367898345/job/64740884021

Failure Details

The conflict checker found a predicted conflict in:

test/util/data/non-backported.txt

Secondary: action also failed with Resource not accessible by integration when trying to post the comment (permissions issue with the conflict-checker action).

Action Required

Rebase ci/fuzz-regression onto current develop to resolve the conflict in test/util/data/non-backported.txt.

[thepastaclaw]

Triage update 2026-02-25 01:01 CST

Still failing. predict_conflicts reports merge conflict in test/util/data/non-backported.txt. PR mergeStateStatus: BLOCKED.

Also getting 'Resource not accessible by integration' when the bot tries to post back, but the conflict itself is the real issue.

This fuzz PR has a valid ## Validation section with concrete evidence (dry-run, single-cycle daemon commands, seed corpus generation, CI behavior described). No validation tracker issue needed.

Run: https://github.com/dashpay/dash/actions/runs/22367898345/job/64740884021

[thepastaclaw]

Triage update 2026-02-25 02:31 CST

Latest run (https://github.com/dashpay/dash/actions/runs/22367898345) shows predict_conflicts still failing with updated fingerprint.

Current conflicts detected (all on src/Makefile.test.include):

• PR #5860 (files: Makefile.test.include, interpreter.cpp/h, script.h/error, sign.cpp, fuzz/eval_script.cpp, etc.)
• PR #5943 (files: Makefile.test.include, fuzz/txrequest.cpp, txrequest.cpp/h, net_processing.cpp/h)
• PR #6236 (files: Makefile.test.include, llmq/chainlocks.cpp, miner.cpp, rpc/rawtransaction.cpp)
• PR #7107 (files: Makefile.test.include, llmq/quorumproofs.cpp/h, blockprocessor.cpp/h, quorumsman.cpp)
• PR #7099 (multiple files including Makefile.test.include)

Note: Previous title referenced non-backported.txt; current failure is potential-conflicts checker detecting file-level overlap with other open PRs. The core issue is that #7173 touches src/Makefile.test.include which many other open PRs also touch. This is a coordination issue, not a hard merge conflict.

[thepastaclaw]

Rebase Complete

Branch: ci/fuzz-regression (force-pushed to origin)
PR: dashpay/dash#7173

What was done

Rebased ci/fuzz-regression (2 commits) onto current upstream/develop to resolve the predicted merge conflict in test/util/data/non-backported.txt.

The conflict was caused by upstream changes removing 3 lines from non-backported.txt (Qt widget files removed by #7118) while our branch added fuzz target entries nearby. Git resolved this cleanly during rebase — no manual conflict resolution was needed.

Commits (rebased)

• 10070027e8 — ci: add fuzz regression testing and continuous fuzzing infrastructure
• c194d87d9d — Apply suggestion from @UdjinM6

Verification

• Rebase completed without conflicts
• Diff against upstream/develop shows only our intended additions (9 fuzz targets in sorted position + 1 deserialize target at end)
• No unrelated changes introduced

[thepastaclaw]

Resolved: predict_conflicts check is now passing on dashpay/dash#7173 (confirmed 2026-02-25 04:01 CST). No merge conflict in non-backported.txt.