Skip to content

backport: Merge bitcoin/bitcoin#23050 #15909

backport: Merge bitcoin/bitcoin#23050

backport: Merge bitcoin/bitcoin#23050 #15909

Triggered via pull request November 25, 2024 04:03
@vijaydasmpvijaydasmp
synchronize #6221
Status Success
Total duration 26s
Artifacts

predict-conflicts.yml

on: pull_request_target
predict_conflicts
17s
predict_conflicts
Fit to window
Zoom out
Zoom in

Annotations

4 warnings
predict_conflicts
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/
predict_conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
predict_conflicts
{ pull_number: 6221, 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/txmempool.cpp' ] }, { number: 5598, files: [ 'configure.ac', 'src/coinjoin/client.h', 'src/coinjoin/context.cpp', 'src/core_write.cpp', 'src/evo/deterministicmns.h', 'src/evo/dmn_types.h', 'src/llmq/context.cpp', 'src/node/coinstats.cpp', 'src/qt/networkstyle.cpp', 'src/script/interpreter.cpp', 'src/script/script.h', 'src/test/fuzz/string.cpp', 'src/txmempool.cpp' ], conflicts: [ 'src/txmempool.cpp' ] }, { number: 6259, files: [ 'src/bench/mempool_stress.cpp', 'src/net_processing.cpp', 'src/test/fuzz/string.cpp', 'src/test/fuzz/tx_pool.cpp', 'src/test/getarg_tests.cpp', 'src/test/util_tests.cpp', 'src/txmempool.cpp', 'src/txmempool.h', 'src/util/strencodings.h', 'src/validation.cpp', 'src/validation.h', 'src/wallet/wallet.cpp', 'src/wallet/wallet.h', 'test/functional/test_runner.py', 'test/functional/wallet_transactiontime_rescan.py', 'test/lint/lint-circular-dependencies.sh', 'test/lint/lint-locale-dependence.sh' ], conflicts: [ 'src/txmempool.cpp' ] }, { number: 6099, files: [ 'doc/release-notes-23065.md', 'doc/release-process.md', 'src/interfaces/wallet.h', 'src/qt/coincontroldialog.cpp', 'src/rpc/client.cpp', 'src/txmempool.cpp', 'src/txmempool.h', 'src/validation.cpp', 'src/wallet/interfaces.cpp', 'src/wallet/rpcwallet.cpp', 'src/wallet/wallet.cpp', 'src/wallet/wallet.h', 'src/wallet/walletdb.cpp', 'src/wallet/walletdb.h', 'test/functional/mempool_updatefromblock.py', 'test/functional/wallet_basic.py' ], conflicts: [ 'src/txmempool.cpp' ] } ] }
predict_conflicts
Potential conflicts detected!