Skip to content
Check Potential Conflicts

Check Potential Conflicts #8129

Sign in to view logs

Check Potential Conflicts

Check Potential Conflicts #8129

Triggered via pull request review October 19, 2023 23:01
@PastaPastaPastaPastaPastaPasta
submitted ⁠ cc6d957
Status Success
Total duration 34s
Artifacts –
This run and associated checks have been archived and are scheduled for deletion. Learn more about checks retention

predict-conflicts.yml

on: pull_request_review
main
24s
main
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: 5627, 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/llmq/utils.cpp', 'src/llmq/utils.h' ] }, { 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: 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', '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/dkgsessionmgr.cpp', 'src/llmq/dkgsessionmgr.h', 'src/llmq/quorums.cpp', 'src/llmq/quorums.h', 'src/llmq/signing_shares.h', 'src/llmq/utils.cpp', 'src/masternode/meta.cpp', 'src/masternode/payments.cpp', 'src/masternode/payments.h', 'src/masternode/utils.cpp', 'src/miner.cpp', 'src/net_processing.cpp', 'src/rpc/masternode.cpp', 'src/rpc/rpcevo.cpp', 'src/rpc/rpcquorums.cpp', 'src/spork.cpp', 'src/spork.h', 'src/test/setup_common.cpp', 'src/validation.cpp', 'src/wallet/wallet.cpp', 'src/wallet/wallet.h' ], conflicts: [ 'src/llmq/utils.cpp' ] }, { number: 5513, files: [ 'ci/dash/build-docker.sh', 'ci/dash/build_depends.sh', 'ci/dash/build_src.sh', 'ci/dash/matrix.sh', 'ci/dash/push-docker.sh', 'ci/dash/test_integrationtests.sh', 'ci/dash/test_unittests.sh', 'contrib/auto_gdb/common_helpers.py', 'contrib/auto_gdb/dash_dbg.sh', 'contrib/auto_gdb/log_size.py', 'contrib/auto_gdb/simple_class_obj.py', 'contrib/auto_gdb/stl_containers.py', 'contrib/auto_gdb/used_size.py', 'contrib/containers/deploy/docker-entrypoint.sh', 'src/batchedlogger.cpp', 'src/batc
main
Potential conflicts detected!