Skip to content

Check Potential Conflicts #13151

Check Potential Conflicts

Check Potential Conflicts #13151

Triggered via pull request review July 8, 2024 12:11
@thephezthephez
submitted a42e9df
Status Success
Total duration 42s
Artifacts

predict-conflicts.yml

on: pull_request_review
Fit to window
Zoom out
Zoom in

Annotations

4 warnings
main
The following actions uses Node.js version which is deprecated and will be forced to run on node20: actions/checkout@v3. For more info: https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/
main
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
main
{ pull_number: 6095, conflictPrs: [ { number: 6019, files: [ 'ci/test/00_setup_env_arm.sh', 'ci/test/00_setup_env_mac.sh', 'ci/test/00_setup_env_mac_host.sh', 'ci/test/00_setup_env_native_asan.sh', 'ci/test/00_setup_env_native_fuzz.sh', 'ci/test/00_setup_env_native_multiprocess.sh', 'ci/test/00_setup_env_native_nowallet.sh', 'ci/test/00_setup_env_native_qt5.sh', 'ci/test/00_setup_env_native_tsan.sh', 'ci/test/00_setup_env_s390x.sh', 'ci/test/00_setup_env_win64.sh', 'configure.ac', 'doc/Doxyfile.in', 'doc/build-openbsd.md', 'doc/external-signer.md', 'src/Makefile.am', 'src/Makefile.test.include', 'src/dummywallet.cpp', 'src/external_signer.cpp', 'src/external_signer.h', 'src/interfaces/node.h', 'src/interfaces/wallet.h', 'src/node/interfaces.cpp', 'src/qt/createwalletdialog.cpp', 'src/qt/createwalletdialog.h', 'src/qt/forms/createwalletdialog.ui', 'src/qt/forms/optionsdialog.ui', 'src/qt/forms/receiverequestdialog.ui', 'src/qt/optionsdialog.cpp', 'src/qt/optionsmodel.cpp', 'src/qt/optionsmodel.h', 'src/qt/receiverequestdialog.cpp', 'src/qt/sendcoinsdialog.cpp', 'src/qt/walletcontroller.cpp', 'src/qt/walletmodel.cpp', 'src/qt/walletmodel.h', 'src/qt/walletmodeltransaction.cpp', 'src/qt/walletmodeltransaction.h', 'src/rpc/client.cpp', 'src/rpc/external_signer.cpp', 'src/rpc/register.h', 'src/test/system_tests.cpp', 'src/util/error.cpp', 'src/util/error.h', 'src/util/system.cpp', 'src/util/system.h', 'src/wallet/external_signer_scriptpubkeyman.cpp', 'src/wallet/external_signer_scriptpubkeyman.h', 'src/wallet/init.cpp', 'src/wallet/interfaces.cpp', 'src/wallet/rpcwallet.cpp', 'src/wallet/scriptpubkeyman.h', 'src/wallet/wallet.cpp', 'src/wallet/wallet.h', 'src/wallet/walletdb.cpp', 'src/wallet/walletdb.h', 'src/wallet/walletutil.h', 'test/config.ini.in', 'test/functional/mocks/invalid_signer.py', 'test/functional/mocks/signer.py', 'test/functional/rpc_help.py', 'test/functional/rpc_signer.py', 'test/functional/test_framework/test_framework.py', 'test/functional/test_framework/test_node.py', 'test/functional/test_runner.py', 'test/functional/wallet_signer.py' ], conflicts: [ 'src/wallet/rpcwallet.cpp', 'test/functional/test_framework/test_node.py' ] }, { number: 6060, files: [ 'doc/developer-notes.md', 'src/net_processing.cpp', 'src/sync.cpp', 'src/sync.h', 'src/test/txvalidationcache_tests.cpp', 'src/validation.cpp', 'src/wallet/rpcwallet.cpp', 'src/wallet/scriptpubkeyman.h', 'src/wallet/wallet.h', 'test/functional/interface_zmq.py', 'test/functional/p2p_filter.py', 'test/functional/p2p_leak.py', 'test/functional/test_framework/messages.py', 'test/functional/test_framework/p2p.py', 'test/functional/test_framework/test_node.py', 'test/functional/wallet_watchonly.py' ], conflicts: [ 'src/wallet/rpcwallet.cpp', 'test/functional/test_framework/test_node.py' ] }, { number: 6071, files: [ 'doc/release-notes-22570.md', 'src/coinjoin/client.cpp', 'src/rpc/rawtransaction.cpp', 'src/rpc/rawtransaction_util.cpp', 'src/rpc/rawtransaction_util.h', 'src/script/sign.cpp', 'src/script/sign.h', 'src/test/fuzz/script_sign.cpp', 'src/test/util/setup_common.cpp', 'src/test/util/wallet.cpp', 'src/txmempool.cpp', 'src/txmempool.h', 'src/util/translation.h', 'src/validat
main
Potential conflicts detected!