Skip to content

backport: bitcoin#24349, 23002, 24281, 24360, 24347, 24376, 24343, 24137, 24370, 24305 #15974

backport: bitcoin#24349, 23002, 24281, 24360, 24347, 24376, 24343, 24137, 24370, 24305

backport: bitcoin#24349, 23002, 24281, 24360, 24347, 24376, 24343, 24137, 24370, 24305 #15974

Triggered via pull request November 27, 2024 14:59
@vijaydasmpvijaydasmp
opened #6435
Status Success
Total duration 44s
Artifacts

predict-conflicts.yml

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

Annotations

3 warnings
predict_conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
predict_conflicts
{ pull_number: 6435, 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/wallet/wallet.cpp' ] }, { 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' ] }, { number: 5943, files: [ 'src/Makefile.am', 'src/Makefile.test.include', 'src/governance/governance.cpp', 'src/llmq/blockprocessor.cpp', 'src/llmq/chainlocks.cpp', 'src/llmq/dkgsessionhandler.cpp', 'src/llmq/instantsend.cpp', 'src/llmq/signing.cpp', 'src/net.h', 'src/net_processing.cpp', 'src/net_processing.h', 'src/protocol.h', 'src/spork.cpp', 'src/spork.h', 'src/test/fuzz/txrequest.cpp', 'src/test/txrequest_tests.cpp', 'src/txrequest.cpp', 'src/txrequest.h', 'test/functional/p2p_tx_download.py' ], conflicts: [ 'src/Makefile.test.include' ] }, { number: 6019, files: [ 'ci/test/00_setup_env_arm.sh', 'ci/test/00_setup_env_mac.sh', 'ci/test/00_setup_env_mac_host.sh', 'ci/test/00_setup_env_native_asan.sh', 'ci/test/00_setup_env_native_fuzz.sh', 'ci/test/00_setup_env_native_multiprocess.sh', 'ci/test/00_setup_env_native_nowallet.sh', 'ci/test/00_setup_env_native_qt5.sh', 'ci/test/00_setup_env_native_tsan.sh', 'ci/test/00_setup_env_s390x.sh', 'ci/test/00_setup_env_win64.sh', 'configure.ac', 'doc/Doxyfile.in', 'doc/build-openbsd.md', 'doc/external-signer.md', 'src/Makefile.am', 'src/Makefile.test.include', 'src/dummywallet.cpp', 'src/external_signer.cpp', 'src/external_signer.h', 'src/interfaces/node.h', 'src/interfaces/wallet.h', 'src/node/interfaces.cpp', 'src/qt/createwalletdialog.cpp', 'src/qt/createwalletdialog.h', 'src/qt/forms/createwalletdialog.ui', 'src/qt/forms/optionsdialog.ui', 'src/qt/forms/receiverequestdialog.ui', 'src/qt/optionsdialog.cpp', 'src/qt/optionsmodel.cpp', 'src/qt/optionsmodel.h', 'src/qt/receiverequestdialog.cpp', 'src/qt/sendcoinsdialog.cpp', 'src/qt/walletcontroller.cpp', 'src/qt/walletmodel.cpp', 'src/qt/walletmodel.h', 'src/qt/walletmodeltransaction.cpp', 'src/qt/walletmodeltransaction.h', 'src/rpc/client.cpp', 'src/rpc/external_signer.cpp', 'src/rpc/register.h', 'src/test/system_tests.cpp', 'src/util/error.cpp', 'src/util/error.h', 'src/util/system.cpp', 'src/util/system.h', 'src/wallet/external_signer_scriptpubkeyman.cpp', 'src/wallet/external_signer_scriptpubkeyman.h', 'src/wallet/init.cpp', 'src/wallet/interfaces.cpp', 'src/wallet/rpcwallet.cpp', 'src/wallet/scriptpubkeyman.h', 'src/wallet/wallet.cpp', 'src/wallet/wallet.h', 'src/wallet/walletdb.cpp', 'src/wallet/walletdb.h', 'src/wallet/walletutil.h', 'test/config.ini.in', 'test/functional/mocks/inv
predict_conflicts
Potential conflicts detected!