Skip to content

chore: merge master 23.1.5 back into develop #26492

chore: merge master 23.1.5 back into develop

chore: merge master 23.1.5 back into develop #26492

Triggered via pull request June 27, 2026 11:40
@thepastaclawthepastaclaw
submitted #7379
Status Success
Total duration 46s
Artifacts

predict-conflicts.yml

on: pull_request_review
predict_conflicts
43s
predict_conflicts
Fit to window
Zoom out
Zoom in

Annotations

1 error and 5 warnings
predict_conflicts
predict_conflicts
API rate limited (attempt 2/3), retrying in 2453ms
predict_conflicts
API rate limited (attempt 1/3), retrying in 1258ms
predict_conflicts
Potential conflicts detected!
predict_conflicts
{ pull_number: 7379, conflictPrs: [ { number: 6182, files: [ 'src/governance/common.cpp', 'src/governance/common.h', 'src/governance/governance.cpp', 'src/governance/object.cpp', 'src/governance/object.h', 'src/interfaces/node.h', 'src/rpc/governance.cpp', 'src/wallet/wallet.cpp', 'src/wallet/wallet.h', 'test/functional/feature_governance.py', 'test/functional/feature_governance_cl.py', 'test/functional/feature_governance_objects.py', 'test/functional/interface_zmq_dash.py', 'test/functional/test_framework/governance.py', 'test/functional/test_framework/messages.py' ], conflicts: [ 'test/functional/test_framework/messages.py' ] }, { number: 5772, files: [ 'doc/release-notes-5772.md', 'src/rpc/quorums.cpp', 'test/functional/p2p_quorum_data.py' ], conflicts: [ 'test/functional/p2p_quorum_data.py' ] }, { 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/qt/clientmodel.h', 'src/qt/governancelist.cpp', 'src/qt/masternodelist.cpp', 'src/qt/masternodelist.h', 'src/qt/rpcconsole.cpp', 'src/rest.cpp', 'src/rpc/blockchain.cpp', 'src/rpc/evo.cpp', 'src/rpc/fees.cpp', '
predict_conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']