backport: Merge bitcoin#23712 , 23346 #16642
Annotations
4 warnings
|
ubuntu-latest pipelines will use ubuntu-24.04 soon. For more details, see https://github.com/actions/runner-images/issues/10636
|
|
check for potential conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|
|
check for potential conflicts
{
pull_number: 6308,
conflictPrs: [
{
number: 6265,
files: [
'contrib/debian/examples/dash.conf',
'doc/release-notes-remove-rescan.md',
'src/dummywallet.cpp',
'src/init.cpp',
'src/wallet/init.cpp',
'src/wallet/rpcdump.cpp',
'src/wallet/rpcwallet.cpp',
'src/wallet/salvage.cpp',
'src/wallet/test/wallet_tests.cpp',
'src/wallet/wallet.cpp',
'src/wallet/wallet.h',
'src/wallet/walletdb.cpp',
'src/wallet/walletdb.h',
'src/wallet/wallettool.cpp',
'test/functional/feature_notifications.py',
'test/functional/wallet_basic.py',
'test/functional/wallet_hd.py'
],
conflicts: [ 'src/wallet/wallettool.cpp' ]
},
{
number: 6258,
files: [
'src/bitcoin-wallet.cpp',
'src/qt/forms/createwalletdialog.ui',
'src/wallet/rpcwallet.cpp',
'src/wallet/wallettool.cpp',
'test/functional/tool_wallet.py'
],
conflicts: [ 'src/bitcoin-wallet.cpp', 'src/wallet/wallettool.cpp' ]
}
]
}
|
|
check for potential conflicts
Potential conflicts detected!
|
Loading