backport: Merge bitcoin/bitcoin#26733 #23889
Triggered via pull request
February 25, 2026 06:32
vijaydasmp
vijaydasmp
synchronize
#7150
Status
Success
Total duration
27s
Artifacts
–
predict-conflicts.yml
on: pull_request_target
predict_conflicts
24s
Annotations
3 warnings
|
predict_conflicts
Potential conflicts detected!
|
|
predict_conflicts
{
pull_number: 7150,
conflictPrs: [
{
number: 7037,
files: [
'doc/release-notes-remove-rescan.md',
'src/dummywallet.cpp',
'src/init.cpp',
'src/wallet/init.cpp',
'src/wallet/rpc/backup.cpp',
'src/wallet/rpc/wallet.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',
'test/functional/wallet_upgradetohd.py'
],
conflicts: [ 'test/functional/wallet_basic.py' ]
},
{
number: 7119,
files: [ 'test/functional/wallet_basic.py' ],
conflicts: [ 'test/functional/wallet_basic.py' ]
},
{
number: 7131,
files: [
'doc/release-notes-24118.md',
'src/rpc/client.cpp',
'src/wallet/rpc/spend.cpp',
'src/wallet/rpc/wallet.cpp',
'test/functional/test_runner.py',
'test/functional/wallet_basic.py',
'test/functional/wallet_fundrawtransaction.py',
'test/functional/wallet_groups.py',
'test/functional/wallet_sendall.py',
'test/functional/wallet_signer.py'
],
conflicts: [ 'test/functional/wallet_basic.py' ]
}
]
}
|
|
predict_conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|