Skip to content

backport: Merge bitcoin#18448,24433, 24139, 23001, (partial) 24339, (partial) core/gui#420 #14131

backport: Merge bitcoin#18448,24433, 24139, 23001, (partial) 24339, (partial) core/gui#420

backport: Merge bitcoin#18448,24433, 24139, 23001, (partial) 24339, (partial) core/gui#420 #14131

Triggered via pull request August 16, 2024 08:31
@vijaydasmpvijaydasmp
opened #6220
Status Success
Total duration 24s
Artifacts

predict-conflicts.yml

on: pull_request_target
Fit to window
Zoom out
Zoom in

Annotations

4 warnings
main
The following actions use a deprecated Node.js version 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: 6220, 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/rpc/misc.cpp' ] }, { number: 6207, files: [ 'src/rpc/misc.cpp', 'test/functional/feature_llmq_rotation.py', 'test/functional/feature_multikeysporks.py', 'test/functional/feature_sporks.py', 'test/functional/test_framework/test_framework.py' ], conflicts: [ 'src/rpc/misc.cpp' ] }, { number: 6064, files: [ 'src/rpc/rawtransaction.cpp', 'src/txmempool.cpp', 'src/txmempool.h', 'src/validation.cpp', 'src/validation.h', 'test/functional/mempool_compatibility.py', 'test/functional/mempool_package_limits.py', 'test/functional/mempool_package_onemore.py', 'test/functional/mempool_packages.py', 'test/functional/mempool_updatefromblock.py', 'test/functional/p2p_addrfetch.py', 'test/functional/rpc_fundrawtransaction.py', 'test/functional/rpc_packages.py', 'test/functional/test_framework/messages.py', 'test/functional/test_framework/wallet.py', 'test/functional/test_runner.py' ], conflicts: [ 'test/functional/rpc_fundrawtransaction.py' ] } ] }
main
Potential conflicts detected!