backport: bitcoin#25992, 25955 #17175
Annotations
3 warnings
check for potential conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|
check for potential conflicts
{
pull_number: 6558,
conflictPrs: [
{
number: 6529,
files: [
'src/bench/coin_selection.cpp',
'src/bench/wallet_balance.cpp',
'src/bitcoin-cli.cpp',
'src/coinjoin/client.cpp',
'src/coinjoin/interfaces.cpp',
'src/dummywallet.cpp',
'src/init.cpp',
'src/interfaces/coinjoin.h',
'src/interfaces/wallet.h',
'src/node/blockstorage.cpp',
'src/qt/test/addressbooktests.cpp',
'src/qt/test/wallettests.cpp',
'src/rpc/coinjoin.cpp',
'src/rpc/evo.cpp',
'src/rpc/governance.cpp',
'src/rpc/masternode.cpp',
'src/rpc/register.h',
'src/rpc/server_util.cpp',
'src/test/util/setup_common.cpp',
'src/test/util/wallet.cpp',
'src/wallet/coinselection.cpp',
'src/wallet/coinselection.h',
'src/wallet/context.cpp',
'src/wallet/context.h',
'src/wallet/init.cpp',
'src/wallet/interfaces.cpp',
'src/wallet/load.cpp',
'src/wallet/load.h',
'src/wallet/rpc/util.cpp',
'src/wallet/rpcwallet.cpp',
'src/wallet/spend.cpp',
'src/wallet/test/coinjoin_tests.cpp',
'src/wallet/test/coinselector_tests.cpp',
'src/wallet/test/init_test_fixture.cpp',
'src/wallet/test/psbt_wallet_tests.cpp',
'src/wallet/test/util.cpp',
'src/wallet/test/wallet_test_fixture.cpp',
'src/wallet/test/wallet_tests.cpp',
'src/wallet/wallet.cpp',
'src/wallet/wallet.h',
'src/wallet/walletdb.cpp',
'src/wallet/walletdb.h',
'src/walletinitinterface.h',
'test/functional/rpc_fundrawtransaction.py'
],
conflicts: [ 'src/wallet/load.cpp' ]
}
]
}
|
check for potential conflicts
Potential conflicts detected!
|
Loading