Skip to content

backport: bitcoin#18742, #28150 #9100

backport: bitcoin#18742, #28150

backport: bitcoin#18742, #28150 #9100

Triggered via pull request November 26, 2023 21:10
@PastaPastaPastaPastaPastaPasta
synchronize #5726
Status Success
Total duration 32s
Artifacts

predict-conflicts.yml

on: pull_request_target
Fit to window
Zoom out
Zoom in

Annotations

3 warnings
main
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
main
{ pull_number: 5726, conflictPrs: [ { number: 4927, files: [ 'src/coinjoin/client.cpp', 'src/coinjoin/coinjoin.cpp', 'src/coinjoin/coinjoin.h', 'src/coinjoin/server.cpp', 'src/coinjoin/server.h', 'src/dsnotificationinterface.cpp', 'src/dsnotificationinterface.h', 'src/evo/cbtx.cpp', 'src/evo/cbtx.h', 'src/evo/mnhftx.cpp', 'src/evo/mnhftx.h', 'src/evo/simplifiedmns.cpp', 'src/evo/simplifiedmns.h', 'src/evo/specialtxman.cpp', 'src/evo/specialtxman.h', 'src/init.cpp', 'src/interfaces/node.cpp', 'src/llmq/blockprocessor.h', 'src/llmq/chainlocks.cpp', 'src/llmq/chainlocks.h', 'src/llmq/debug.cpp', 'src/llmq/debug.h', 'src/llmq/dkgsession.cpp', 'src/llmq/dkgsession.h', 'src/llmq/dkgsessionhandler.cpp', 'src/llmq/dkgsessionhandler.h', 'src/llmq/dkgsessionmgr.cpp', 'src/llmq/dkgsessionmgr.h', 'src/llmq/init.cpp', 'src/llmq/init.h', 'src/llmq/instantsend.cpp', 'src/llmq/instantsend.h', 'src/llmq/quorums.cpp', 'src/llmq/quorums.h', 'src/llmq/signing.cpp', 'src/llmq/signing.h', 'src/llmq/signing_shares.cpp', 'src/llmq/signing_shares.h', 'src/llmq/snapshot.cpp', 'src/llmq/snapshot.h', 'src/miner.cpp', 'src/miner.h', 'src/net_processing.cpp', 'src/net_processing.h', 'src/node/context.cpp', 'src/node/context.h', 'src/rpc/rpcquorums.cpp', 'src/test/block_reward_reallocation_tests.cpp', 'src/test/blockfilter_index_tests.cpp', 'src/test/dynamic_activation_thresholds_tests.cpp', 'src/test/miner_tests.cpp', 'src/test/util.cpp', 'src/test/util/setup_common.cpp', 'src/test/validation_block_tests.cpp' ], conflicts: [ 'src/test/validation_block_tests.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/rpc/mining.cpp', 'src/test/validation_block_tests.cpp' ] } ] }
main
Potential conflicts detected!