backport: bitcoin#18933, #23123, #23147, #23549, #26074, #26207, #26307, #26341, #26352, #26656, #26886, #26996, #27035#7192
Open
knst wants to merge 11 commits into
Open
backport: bitcoin#18933, #23123, #23147, #23549, #26074, #26207, #26307, #26341, #26352, #26656, #26886, #26996, #27035#7192knst wants to merge 11 commits into
knst wants to merge 11 commits into
Annotations
2 errors and 3 warnings
|
Fail if conflicts exist
Process completed with exit code 1.
|
|
validate potential conflicts
Process completed with exit code 1.
|
|
check for potential conflicts
Potential conflicts detected!
|
|
check for potential conflicts
{
pull_number: 7192,
conflictPrs: [
{
number: 6904,
files: [
'ci/dash/lint-tidy.sh',
'doc/REST-interface.md',
'doc/release-notes-6888.md',
'src/Makefile.am',
'src/bench/duplicate_inputs.cpp',
'src/bitcoind.cpp',
'src/bls/bls.cpp',
'src/bls/bls.h',
'src/coinjoin/client.cpp',
'src/deploymentstatus.cpp',
'src/deploymentstatus.h',
'src/evo/creditpool.cpp',
'src/evo/creditpool.h',
'src/evo/deterministicmns.cpp',
'src/evo/deterministicmns.h',
'src/evo/mnhftx.cpp',
'src/evo/mnhftx.h',
'src/evo/providertx.cpp',
'src/evo/providertx.h',
'src/evo/smldiff.cpp',
'src/evo/specialtxman.cpp',
'src/governance/classes.cpp',
'src/governance/governance.cpp',
'src/index/base.cpp',
'src/index/base.h',
'src/index/blockfilterindex.cpp',
'src/index/blockfilterindex.h',
'src/index/coinstatsindex.cpp',
'src/index/coinstatsindex.h',
'src/index/txindex.cpp',
'src/index/txindex.h',
'src/init.cpp',
'src/init.h',
'src/init/common.cpp',
'src/init/common.h',
'src/interfaces/chain.h',
'src/interfaces/node.h',
'src/kernel/chain.cpp',
'src/kernel/chain.h',
'src/kernel/checks.cpp',
'src/kernel/checks.h',
'src/kernel/context.cpp',
'src/kernel/context.h',
'src/kernel/mempool_limits.h',
'src/kernel/mempool_options.h',
'src/llmq/blockprocessor.cpp',
'src/llmq/commitment.cpp',
'src/llmq/commitment.h',
'src/llmq/context.cpp',
'src/llmq/debug.cpp',
'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/options.cpp',
'src/llmq/options.h',
'src/llmq/quorums.cpp',
'src/llmq/quorums.h',
'src/llmq/utils.cpp',
'src/llmq/utils.h',
'src/masternode/payments.cpp',
'src/net_processing.cpp',
'src/node/chainstate.cpp',
'src/node/context.cpp',
'src/node/context.h',
'src/node/interfaces.cpp',
'src/node/mempool_args.cpp',
'src/node/mempool_args.h',
'src/node/miner.cpp',
'src/node/psbt.cpp',
'src/policy/fees.cpp',
'src/policy/fees.h',
'src/policy/fees_args.cpp',
'src/policy/fees_args.h',
'src/policy/packages.h',
'src/policy/policy.cpp',
'src/policy/policy.h',
'src/policy/settings.cpp',
'src/policy/settings.h',
'src/qt/clientmodel.cpp',
'src/qt/clientmodel.h',
'src/qt/governancelist.cpp',
'src/qt/masternodelist.cpp',
'src/qt/masternodelist.h',
'src/qt/rpcconsole.cpp',
'src/rest.cpp',
'src/rpc/blockchain.cpp',
'src/rpc/evo.cpp',
'src/rpc/fees.cpp',
'src/rpc/governance.cpp',
'src/rpc/masternode.cpp',
'src/rpc/mempool.cpp',
'src/rpc/mining.cpp',
'src/rpc/net.cpp',
'src/rpc/quorums.cpp',
'src/rpc/rawtransaction.cpp',
'src/script/standard.cpp',
'src/script/standard.h'
],
conflicts: [
'doc/REST-interface.md',
'src/rest.cpp',
'src/rpc/blockchain.cpp',
'src/rpc/mining.cpp'
]
},
{
number: 6595,
files: [
'src/init.cpp',
'src/net_processing.cpp',
'src/qt/test/wallettests.cpp',
'src/rest.cpp',
'src/test/interfaces_tests.cpp',
'src/test/validation_block_tests.cpp',
'src/test/validation_chainstatemanager_tests.cpp',
'src/validation.h',
'src/wallet/rpc/spend.cpp',
'src/wallet/test/spend_tests.cpp',
'src/wallet/test/wallet_tests.cpp'
],
conflicts: [ 'src/rest.cpp', 'src/wallet/rpc/spend.cpp' ]
}
|
|
check for potential conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|
background
wait
wait-all
cancel
parallel
Loading