Check Potential Conflicts #8642
Annotations
1 error and 3 warnings
main
Process completed with exit code 1.
|
main
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|
main
{
pull_number: 5651,
conflictPrs: [
{
number: 4798,
files: [
'src/Makefile.am',
'src/bloom.cpp',
'src/evo/cbtx.cpp',
'src/evo/deterministicmns.cpp',
'src/evo/deterministicmns.h',
'src/evo/mnhftx.cpp',
'src/init.cpp',
'src/llmq/blockprocessor.cpp',
'src/llmq/commitment.cpp',
'src/llmq/commitment.h',
'src/llmq/complex_utils.cpp',
'src/llmq/complex_utils.h',
'src/llmq/debug.cpp',
'src/llmq/dkgsession.cpp',
'src/llmq/dkgsession.h',
'src/llmq/dkgsessionhandler.cpp',
'src/llmq/dkgsessionmgr.cpp',
'src/llmq/dkgsessionmgr.h',
'src/llmq/quorums.cpp',
'src/llmq/quorums.h',
'src/llmq/signing.cpp',
'src/llmq/signing_shares.cpp',
'src/llmq/snapshot.cpp',
'src/llmq/snapshot.h',
'src/llmq/utils.cpp',
'src/llmq/utils.h',
'src/miner.cpp',
'src/net_processing.cpp',
'src/rpc/rpcquorums.cpp',
'src/test/evo_utils_tests.cpp',
'src/util/hexstr.cpp',
'src/util/hexstr.h',
'test/lint/lint-circular-dependencies.sh'
],
conflicts: [
'src/evo/deterministicmns.cpp',
'src/evo/deterministicmns.h',
'src/llmq/utils.cpp',
'src/llmq/utils.h',
'src/test/evo_utils_tests.cpp'
]
},
{
number: 4631,
files: [
'src/llmq/blockprocessor.cpp',
'src/llmq/chainlocks.cpp',
'src/llmq/commitment.h',
'src/llmq/dkgsession.cpp',
'src/llmq/dkgsession.h',
'src/llmq/dkgsessionhandler.cpp',
'src/llmq/dkgsessionmgr.cpp',
'src/llmq/instantsend.cpp',
'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/utils.cpp',
'src/llmq/utils.h'
],
conflicts: [ 'src/llmq/utils.cpp', 'src/llmq/utils.h' ]
},
{
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/evo/deterministicmns.h' ]
},
{
number: 4472,
files: [
'src/coinjoin/client.cpp',
'src/coinjoin/client.h',
'src/coinjoin/coinjoin.cpp',
'src/coinjoin/coinjoin.h',
'src/coinjoin/server.cpp',
'src/coinjoin/server.h',
'src/evo/cbtx.cpp',
'src/evo/cbtx.h',
'src/evo/deterministicmns.cpp',
'src/evo/deterministicmns.h',
'src/evo/simplifiedmns.cpp',
'src/evo/simplifiedmns.h',
'src/llmq/blockprocessor.cpp',
's
|
main
Potential conflicts detected!
|