Skip to content

backport: Merge bitcoin#22619, 22593 #13124

backport: Merge bitcoin#22619, 22593

backport: Merge bitcoin#22619, 22593 #13124

Triggered via pull request July 6, 2024 03:13
@vijaydasmpvijaydasmp
synchronize #6071
Status Success
Total duration 42s
Artifacts

predict-conflicts.yml

on: pull_request_target
Fit to window
Zoom out
Zoom in

Annotations

4 warnings
main
The following actions uses Node.js version which is deprecated and will be forced to run on node20: actions/checkout@v3. For more info: https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/
main
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
main
{ pull_number: 6071, conflictPrs: [ { number: 4956, files: [ 'src/evo/simplifiedmns.cpp', 'src/rpc/server.cpp', 'src/util/ranges.h', 'src/validation.cpp' ], conflicts: [ 'src/rpc/server.cpp', 'src/validation.cpp' ] }, { 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/rpc/misc.cpp', 'src/txmempool.cpp', 'src/wallet/wallet.cpp' ] }, { number: 3495, files: [ 'src/net_processing.cpp', 'src/validation.h', 'src/version.h' ], conflicts: [ 'src/validation.h' ] }, { number: 3362, files: [ 'src/qt/transactiontablemodel.cpp', 'src/qt/transactiontablemodel.h', 'src/qt/walletmodel.cpp', 'src/wallet/wallet.cpp', 'src/wallet/wallet.h' ], conflicts: [ 'src/wallet/wallet.cpp', 'src/wallet/wallet.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/test/util/setup_common.cpp', 'src/validation.cpp' ] }, { number: 5799, files: [ 'src/bloom.cpp', 'src/bloom.h', 'src/chainparams.cpp', 'src/consensus/params.h', 'src/deploymentinfo.cpp', 'src/evo/deterministicmns.cpp', 'src/evo/dmnstate.cpp', 'src/evo/dmnstate.h', 'src/evo/providertx.cpp', 'src/evo/providertx.h', 'src/evo/simplifiedmns.cpp', 'src/evo/simplifiedmns.h', 'src/llmq/ehf_signals.cpp', 'src/masternode/payments.cpp', 'src/qt/masternodelist.cpp', 'src/rpc/blockchain.cpp', 'src/rpc/evo.cpp', 'src/rpc/masternode.cpp', 'src/test/block_reward_reallocation_tests.cpp', 'src/test/data/trivially_invalid.json', 'src/test/data/trivially_valid.json', 'src/test/evo_deterministicmns_tests.cpp', 'src/test/evo_trivialvalidation.cpp', 'test/functional/feature_dip0026.py', 'test/functional/feature_dip3_deterministicmns.py', 'test/functional/feature_llmq_evo.py', 'test/functional/rpc_blockchain.py', 'test/functional/rpc_masternode.py', 'test/functional/test_framework/test_framework.py', 'test/functional/test_runner.py' ], conflicts: [ 'src/rpc/blockchain.cpp', 'test/functional/test_runner.py' ] }, { number: 5860, files: [ 'src/Makefile.test.include', 'src/bench/verify_script.cpp', 'src/chainparams.cpp', 'src/consensus/params.h', 'src/deploymentinfo.cpp', 'src/policy/policy.cpp', 'src/policy/policy.h', 'src/script/int
main
Potential conflicts detected!