Skip to content

chore: merge master into develop #26640

chore: merge master into develop

chore: merge master into develop #26640

Triggered via pull request July 1, 2026 17:24
@thepastaclawthepastaclaw
synchronize #7397
Status Success
Total duration 41s
Artifacts –

predict-conflicts.yml

on: pull_request_target
predict_conflicts
38s
predict_conflicts
Fit to window
Zoom out
Zoom in

Annotations

3 warnings
predict_conflicts
Potential conflicts detected!
predict_conflicts
{ pull_number: 7397, conflictPrs: [ { number: 5943, files: [ 'src/Makefile.am', 'src/Makefile.test.include', 'src/governance/governance.cpp', 'src/llmq/blockprocessor.cpp', 'src/llmq/chainlocks.cpp', 'src/llmq/dkgsessionhandler.cpp', 'src/llmq/instantsend.cpp', 'src/llmq/signing.cpp', 'src/net.h', 'src/net_processing.cpp', 'src/net_processing.h', 'src/protocol.h', 'src/spork.cpp', 'src/spork.h', 'src/test/fuzz/txrequest.cpp', 'src/test/txrequest_tests.cpp', 'src/txrequest.cpp', 'src/txrequest.h', 'test/functional/p2p_tx_download.py' ], conflicts: [ 'src/Makefile.am', 'src/net.h' ] }, { number: 6453, files: [ 'src/llmq/blockprocessor.cpp', 'src/llmq/chainlocks.cpp', 'src/llmq/commitment.cpp', 'src/llmq/debug.cpp', 'src/llmq/dkgsessionhandler.cpp', 'src/llmq/dkgsessionmgr.cpp', 'src/llmq/instantsend.cpp', 'src/llmq/quorums.cpp', 'src/node/blockstorage.cpp', 'src/node/blockstorage.h', 'src/rpc/quorums.cpp', 'src/validation.cpp' ], conflicts: [ 'src/llmq/dkgsessionmgr.cpp' ] }, { number: 6904, files: [ 'ci/dash/lint-tidy.sh', 'doc/REST-interface.md', 'doc/release-notes-6888.md', 'src/Makefile.am', 'src/bench/duplicate_inputs.cpp', 'src/bitcoind.cpp', 'src/bls/bls.cpp', 'src/bls/bls.h', 'src/coinjoin/client.cpp', 'src/deploymentstatus.cpp', 'src/deploymentstatus.h', 'src/evo/creditpool.cpp', 'src/evo/creditpool.h', 'src/evo/deterministicmns.cpp', 'src/evo/deterministicmns.h', 'src/evo/mnhftx.cpp', 'src/evo/mnhftx.h', 'src/evo/providertx.cpp', 'src/evo/providertx.h', 'src/evo/smldiff.cpp', 'src/evo/specialtxman.cpp', 'src/governance/classes.cpp', 'src/governance/governance.cpp', 'src/index/base.cpp', 'src/index/base.h', 'src/index/blockfilterindex.cpp', 'src/index/blockfilterindex.h', 'src/index/coinstatsindex.cpp', 'src/index/coinstatsindex.h', 'src/index/txindex.cpp', 'src/index/txindex.h', 'src/init.cpp', 'src/init.h', 'src/init/common.cpp', 'src/init/common.h', 'src/interfaces/chain.h', 'src/interfaces/node.h', 'src/kernel/chain.cpp', 'src/kernel/chain.h', 'src/kernel/checks.cpp', 'src/kernel/checks.h', 'src/kernel/context.cpp', 'src/kernel/context.h', 'src/kernel/mempool_limits.h', 'src/kernel/mempool_options.h', 'src/llmq/blockprocessor.cpp', 'src/llmq/commitment.cpp', 'src/llmq/commitment.h', 'src/llmq/context.cpp', 'src/llmq/debug.cpp', 'src/llmq/dkgsession.cpp', 'src/llmq/dkgsession.h', 'src/llmq/dkgsessionhandler.cpp', 'src/llmq/dkgsessionhandler.h', 'src/llmq/dkgsessionmgr.cpp', 'src/llmq/dkgsessionmgr.h', 'src/llmq/options.cpp', 'src/llmq/options.h', 'src/llmq/quorums.cpp', 'src/llmq/quorums.h', 'src/llmq/utils.cpp', 'src/llmq/utils.h', 'src/masternode/payments.cpp', 'src/net_processing.cpp', 'src/node/chainstate.cpp', 'src/node/context.cpp', 'src/node/context.h', 'src/node/interfaces.cpp', 'src/node/mempool_args.cpp', 'src/node/mempool_args.h', 'src/node/miner.cpp', 'src/node/psbt.cpp', 'src/policy/fees.cpp', 'src/policy/fees.h', 'src/policy/fees_args.cpp', 'src/policy/fees_args.h', 'src/policy/packages.h', 'src/policy/policy.cpp', 'src/policy/policy.h', 'src/policy/settings.cpp', 'src/policy/settings.h', 'src/qt/clientmodel.cpp', 'src/q
predict_conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']