backport: Merge bitcoin/bitcoin#26733 #23270
Triggered via pull request
January 29, 2026 10:53
cryptotura
opened
#7119
Status
Success
Total duration
33s
Artifacts
–
predict-conflicts.yml
on: pull_request_target
predict_conflicts
30s
Annotations
3 warnings
|
predict_conflicts
Potential conflicts detected!
|
|
predict_conflicts
{
pull_number: 7119,
conflictPrs: [
{
number: 7037,
files: [
'doc/release-notes-remove-rescan.md',
'src/dummywallet.cpp',
'src/init.cpp',
'src/wallet/init.cpp',
'src/wallet/rpc/backup.cpp',
'src/wallet/rpc/wallet.cpp',
'src/wallet/salvage.cpp',
'src/wallet/test/wallet_tests.cpp',
'src/wallet/wallet.cpp',
'src/wallet/wallet.h',
'src/wallet/walletdb.cpp',
'src/wallet/walletdb.h',
'src/wallet/wallettool.cpp',
'test/functional/feature_notifications.py',
'test/functional/wallet_basic.py',
'test/functional/wallet_hd.py',
'test/functional/wallet_upgradetohd.py'
],
conflicts: [ 'test/functional/wallet_basic.py' ]
},
{
number: 7089,
files: [
'ci/lint/04_install.sh',
'contrib/containers/ci/ci-slim.Dockerfile',
'contrib/linearize/linearize-hashes.py',
'contrib/seeds/generate-seeds.py',
'test/functional/example_test.py',
'test/functional/feature_addressindex.py',
'test/functional/feature_asset_locks.py',
'test/functional/feature_bip68_sequence.py',
'test/functional/feature_coinstatsindex.py',
'test/functional/feature_config_args.py',
'test/functional/feature_dip3_deterministicmns.py',
'test/functional/feature_dip3_v19.py',
'test/functional/feature_dip4_coinbasemerkleroots.py',
'test/functional/feature_filelock.py',
'test/functional/feature_governance.py',
'test/functional/feature_governance_cl.py',
'test/functional/feature_governance_objects.py',
'test/functional/feature_index_prune.py',
'test/functional/feature_init.py',
'test/functional/feature_llmq_chainlocks.py',
'test/functional/feature_llmq_connections.py',
'test/functional/feature_llmq_data_recovery.py',
'test/functional/feature_llmq_dkgerrors.py',
'test/functional/feature_llmq_evo.py',
'test/functional/feature_llmq_is_cl_conflicts.py',
'test/functional/feature_llmq_is_retroactive.py',
'test/functional/feature_llmq_rotation.py',
'test/functional/feature_llmq_signing.py',
'test/functional/feature_llmq_simplepose.py',
'test/functional/feature_llmq_singlenode.py',
'test/functional/feature_masternode_params.py',
'test/functional/feature_mnehf.py',
'test/functional/feature_notifications.py',
'test/functional/feature_pruning.py',
'test/functional/feature_spentindex.py',
'test/functional/feature_txindex.py',
'test/functional/feature_unsupported_utxo_db.py',
'test/functional/interface_bitcoin_cli.py',
'test/functional/interface_usdt_coinselection.py',
'test/functional/interface_usdt_utxocache.py',
'test/functional/interface_usdt_validation.py',
'test/functional/interface_zmq_dash.py',
'test/functional/mempool_compatibility.py',
'test/functional/mempool_packages.py',
'test/functional/mempool_persist.py',
'test/functional/mempool_unbroadcast.py',
'test/functional/mocks/invalid_signer.py',
'test/functional/mocks/signer.py',
'test/functional/p2p_addr_relay.py',
'test/functional/p2p_blocksonly.py',
'test/functional/p2p_getaddr_caching.py',
'test/functional/p2p_instantsend.py',
'test/functional/p2p_message_capture.py',
'test/functional/p2p_platform_ban.py',
'test/functional/p2p_quorum_data.py',
'test/functional/rpc_blockchain.py',
'test/functional/rpc_coinjoin.py',
'test/functional/rpc_createmultisig.py',
'test/functional/rpc_help.py',
'test/functional/rpc_invalid_address_message.py',
'test/functional/rpc_masternode.py',
'test/functional/rpc_mnauth.py',
'test/functional/rpc_net.py',
'test/functional/rpc_netinfo.py',
'test/functional/rpc_psbt.py',
'test/functional/rpc_quorum.py',
|
|
predict_conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|