Check Potential Conflicts #7389
Triggered via pull request review
August 28, 2023 14:29
ogabrielides
dismissed
c5107ed
Status
Success
Total duration
44s
Artifacts
–
Annotations
3 warnings
main
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|
main
{
pull_number: 5525,
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/chainparams.cpp' ]
},
{
number: 4491,
files: [
'configure.ac',
'depends/packages/bls-dash.mk',
'src/bls/bls_worker.cpp',
'src/bls/bls_worker.h',
'src/coinjoin/client.cpp',
'src/coinjoin/coinjoin.cpp',
'src/coinjoin/coinjoin.h',
'src/coinjoin/server.cpp',
'src/evo/cbtx.cpp',
'src/evo/deterministicmns.h',
'src/governance/governance.cpp',
'src/governance/object.cpp',
'src/llmq/blockprocessor.cpp',
'src/llmq/commitment.cpp',
'src/llmq/dkgsession.cpp',
'src/llmq/instantsend.cpp',
'src/llmq/quorums.cpp',
'src/llmq/signing_shares.cpp',
'src/masternode/utils.cpp',
'src/prevector.h',
'src/qt/guiutil.cpp',
'src/qt/guiutil.h',
'src/rpc/masternode.cpp',
'src/serialize.h',
'src/stacktraces.cpp',
'src/test/blockfilter_index_tests.cpp',
'src/test/blockfilter_tests.cpp',
'src/test/bloom_tests.cpp',
'src/test/flatfile_tests.cpp',
'src/test/netbase_tests.cpp',
'src/test/random_tests.cpp',
'src/test/streams_tests.cpp',
'src/test/util_tests.cpp',
'src/test/util_threadnames_tests.cpp',
'src/util/system.cpp',
'src/validation.cpp',
'src/validation.h',
'src/wallet/test/coinjoin_tests.cpp',
'src/wallet/test/wallet_tests.cpp',
'src/wallet/wallet.cpp'
],
conflicts: [ 'src/governance/governance.cpp', 'src/governance/object.cpp' ]
},
{
number: 4465,
files: [
'src/governance/classes.h',
'src/governance/governance.cpp',
'src/governance/governance.h',
'src/governance/object.cpp',
'src/governance/object.h'
],
conflicts: [
'src/governance/classes.h',
'src/governance/governance.cpp',
'src/governance/governance.h',
'src/governance/object.cpp',
'src/governance/object.h'
]
},
{
number: 4321,
files: [
'src/Makefile.am',
'src/bls/bls.cpp',
'src/bls/bls.h',
'src/chainparams.cpp',
'src/chainparams.h',
'src/coinjoin/coinjoin-client.cpp',
'src/coinjoin/coinjoin-util.h',
'src/compressor.cpp',
'src/evo/simplifiedmns.cpp',
'src/interfaces/wallet.cpp',
'src/interfaces/wallet.h',
'src/key_io.cpp',
'src/key_io.h',
'src/keystore.cpp',
'src/keystore.h',
'src/rpc/governance.cpp',
'src/rpc/rpcevo.cpp',
'src/rpc/util.cpp',
'src/rpc/util.h',
'src/script/descriptor.cpp',
'src/script/interpreter.cpp',
'src/script/script.cpp',
'src/script/script.h',
'src/script/standard.cpp',
'src/script/standard.h',
'src/test/data/script_tests.json',
'src/test/test_dash.h',
'src/wallet/coincontrol.h',
'src/wallet/keypool.cpp',
'src/wallet/keypool.h',
'src/wallet/rpcwallet.cpp',
'src/wallet/test/coinjoin_tests.cpp',
'src/wallet/test/wallet_tests.cpp',
'src/wallet/wallet.cpp',
'src/wallet/wallet.h',
'src/wallet/walletdb.cpp',
'src/wallet/walletdb.h',
|
main
Potential conflicts detected!
|