Skip to content

backport: (scripted-diff) Merge bitcoin-core/gui#523:, 23044, 22423, 22520 #12564

backport: (scripted-diff) Merge bitcoin-core/gui#523:, 23044, 22423, 22520

backport: (scripted-diff) Merge bitcoin-core/gui#523:, 23044, 22423, 22520 #12564

Triggered via pull request May 15, 2024 02:17
@vijaydasmpvijaydasmp
opened #6021
Status Failure
Total duration 37s
Artifacts

predict-conflicts.yml

on: pull_request_target
Fit to window
Zoom out
Zoom in

Annotations

1 error and 4 warnings
main
Process completed with exit code 1.
main
Node.js 16 actions are deprecated. Please update the following actions to use Node.js 20: actions/checkout@v3. For more information see: https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/.
main
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
main
{ pull_number: 6021, conflictPrs: [ { number: 4686, files: [ 'configure.ac', 'depends/Makefile', 'depends/packages/packages.mk', 'depends/packages/qt.mk', 'src/bench/block_assemble.cpp', 'src/chainparams.cpp', 'src/chainparams.h', 'src/consensus/consensus.h', 'src/consensus/params.h', 'src/consensus/tx_verify.cpp', 'src/qt/paymentserver.cpp', 'src/qt/test/test_main.cpp', 'src/qt/transactiondesc.cpp', 'src/random.cpp', 'src/rpc/misc.cpp', 'src/txmempool.cpp', 'src/wallet/wallet.cpp', 'test/functional/feature_llmq_chainlocks.py', 'test/functional/test_framework/test_framework.py' ], conflicts: [ 'src/qt/paymentserver.cpp' ] }, { number: 4956, files: [ 'src/evo/simplifiedmns.cpp', 'src/rpc/server.cpp', 'src/util/ranges.h', 'src/validation.cpp' ], conflicts: [ 'src/validation.cpp' ] }, { number: 3495, files: [ 'src/net_processing.cpp', 'src/validation.h', 'src/version.h' ], conflicts: [ 'src/validation.h' ] }, { number: 5167, files: [ 'contrib/devtools/copyright_header.py', 'src/Makefile.am', 'src/analytics/sample.cpp', 'src/analytics/sample.h', 'src/analytics/sdclient.cpp', 'src/analytics/sdclient.h', 'src/analytics/sender.cpp', 'src/analytics/sender.h', 'src/init.cpp', 'src/net.cpp', 'src/net_processing.cpp', 'src/netbase.cpp', 'src/netbase.h', 'src/statsd_client.cpp', 'src/statsd_client.h', 'src/test/util/setup_common.cpp', 'src/validation.cpp', 'test/lint/lint-circular-dependencies.sh', 'test/lint/lint-cppcheck-dash.sh', 'test/lint/lint-format-strings.py', 'test/lint/lint-locale-dependence.sh' ], conflicts: [ 'src/validation.cpp' ] }, { number: 5685, files: [ 'doc/release-notes/dash/release-notes-0.14.0.md', 'src/Makefile.am', 'src/init.cpp', 'src/node/miner.cpp', 'src/node/miner.h', 'src/qt/clientmodel.cpp', 'src/qt/guiutil.cpp', 'src/qt/guiutil.h', 'src/qt/intro.cpp', 'src/qt/optionsmodel.cpp', 'src/qt/paymentserver.cpp', 'src/rpc/blockchain.cpp', 'src/rpc/mining.cpp', 'src/rpc/rawtransaction.cpp', 'src/test/addrman_tests.cpp', 'src/test/block_reward_reallocation_tests.cpp', 'src/test/blockfilter_index_tests.cpp', 'src/test/coins_tests.cpp', 'src/test/crypto_tests.cpp', 'src/test/denialofservice_tests.cpp', 'src/test/dynamic_activation_thresholds_tests.cpp', 'src/test/evo_deterministicmns_tests.cpp', 'src/test/fuzz/addrman.cpp', 'src/test/fuzz/connman.cpp', 'src/test/fuzz/key_io.cpp', 'src/test/fuzz/policy_estimator.cpp', 'src/test/fuzz/process_message.cpp', 'src/test/fuzz/process_messages.cpp', 'src/test/fuzz/transaction.cpp', 'src/test/mempool_tests.cpp', 'src/test/miner_tests.cpp', 'src/test/scheduler_tests.cpp', 'src/test/util/mining.cpp', 'src/test/util/setup_common.cpp', 'src/test/util/setup_common.h', 'src/test/util/wallet.cpp', 'src/test/validation_block_tests.cpp', 'src/test/validation_chainstate_tests.cpp', 'src/test/validation_chainstatemanager_tests.cpp', 'src/test/validation_flush_tests.cpp', 'src/wallet/rpcdump.cpp', 'src/wallet/rpcwallet.cpp' ], conflicts: [ 'src/qt/clientmodel.cpp', 'src/qt/guiutil.cpp', 'src/qt/guiutil.h', 'src/qt/intro.cpp', 'src/qt/optionsmodel.cpp', 'src/qt/paymentserver.cpp' ] }, { number: 5799, files: [ 'src/bloom.cpp', 'src/bloom.h', 'src/chainparams.cpp',
main
Potential conflicts detected!