backport: Merge bitcoin#28831, 29657, 29189, 30633, 27905, 28093, 30026, 27780, 28789#7378
Open
vijaydasmp wants to merge 9 commits into
Open
backport: Merge bitcoin#28831, 29657, 29189, 30633, 27905, 28093, 30026, 27780, 28789#7378vijaydasmp wants to merge 9 commits into
vijaydasmp wants to merge 9 commits into
Annotations
3 warnings
|
check for potential conflicts
Potential conflicts detected!
|
|
check for potential conflicts
{
pull_number: 7378,
conflictPrs: [
{
number: 6453,
files: [
'src/llmq/blockprocessor.cpp',
'src/llmq/chainlocks.cpp',
'src/llmq/commitment.cpp',
'src/llmq/debug.cpp',
'src/llmq/dkgsessionhandler.cpp',
'src/llmq/dkgsessionmgr.cpp',
'src/llmq/instantsend.cpp',
'src/llmq/quorums.cpp',
'src/node/blockstorage.cpp',
'src/node/blockstorage.h',
'src/rpc/quorums.cpp',
'src/validation.cpp'
],
conflicts: [ 'src/validation.cpp' ]
},
{
number: 6446,
files: [
'src/coinjoin/client.cpp',
'src/coinjoin/server.cpp',
'src/evo/assetlocktx.cpp',
'src/evo/cbtx.cpp',
'src/evo/deterministicmns.cpp',
'src/evo/deterministicmns.h',
'src/evo/mnauth.cpp',
'src/evo/mnhftx.cpp',
'src/evo/simplifiedmns.cpp',
'src/governance/governance.cpp',
'src/governance/object.cpp',
'src/governance/vote.cpp',
'src/llmq/blockprocessor.cpp',
'src/llmq/blockprocessor.h',
'src/llmq/ehf_signals.cpp',
'src/llmq/instantsend.cpp',
'src/llmq/instantsend.h',
'src/llmq/quorums.cpp',
'src/llmq/quorums.h',
'src/llmq/signing.cpp',
'src/llmq/signing_shares.cpp',
'src/llmq/signing_shares.h',
'src/llmq/snapshot.cpp',
'src/llmq/utils.cpp',
'src/masternode/node.cpp',
'src/masternode/payments.cpp',
'src/net.cpp',
'src/net_processing.cpp',
'src/qt/masternodelist.cpp',
'src/qt/rpcconsole.cpp',
'src/rpc/evo.cpp',
'src/rpc/governance.cpp',
'src/rpc/masternode.cpp',
'src/rpc/quorums.cpp',
'src/test/evo_deterministicmns_tests.cpp',
'src/txmempool.cpp',
'src/validation.cpp'
],
conflicts: [ 'src/validation.cpp' ]
},
{
number: 7217,
files: [
'Makefile.am',
'ci/lint/04_install.sh',
'configure.ac',
'contrib/containers/ci/ci-slim.Dockerfile',
'src/.bear-tidy-config',
'test/bench/bench_framework.py',
'test/bench/bench_helpers.py',
'test/bench/bench_results.py',
'test/bench/bench_runner.py',
'test/bench/example_bench.py',
'test/bench/mempool_bench.py',
'test/bench/rest_bench.py',
'test/bench/rpc_bench.py',
'test/bench/zmq_bench.py'
],
conflicts: [ 'configure.ac' ]
},
{
number: 7109,
files: [
'.cargo/config.toml.offline',
'.gitignore',
'Cargo.lock',
'Cargo.toml',
'Makefile.am',
'configure.ac',
'contrib/containers/ci/ci.Dockerfile',
'contrib/devtools/update-native-cxxbridge.py',
'contrib/devtools/update-rust-hashes.py',
'contrib/guix/guix-build',
'contrib/guix/libexec/build.sh',
'contrib/guix/manifest.scm',
'contrib/guix/symbol-check.py',
'depends/Makefile',
'depends/config.site.in',
'depends/funcs.mk',
'depends/packages/native_cxxbridge.mk',
'depends/packages/native_rust.mk',
'depends/packages/packages.mk',
'depends/packages/rust_stdlib.mk',
'depends/packages/rustcxx.mk',
'depends/patches/native_cxxbridge/Cargo.lock',
'depends/patches/native_cxxbridge/cargo-config.toml',
'depends/patches/native_rust/fix-elf-interpreter.sh',
'rust-toolchain.toml',
'rust/Makefile.am',
'rust/Makefile.chirp.include',
'rust/Makefile.libs.include',
'rust/chirp/Cargo.toml',
'rust/chirp/build.rs',
'rust/chirp/src/lib.rs',
'src/Makefile.am',
'src/Makefile.bench.include',
'src/Makefile.qt.include',
'src/Makefile.qttest.include',
'src/Makefile.test.include',
'src/init.cpp',
'test/lint/lint-files.py',
'test/lint/lint-format-strings.py',
'test/lint/lint-include-guards.py',
'test/lint/lint-includes.p
|
|
check for potential conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|
background
wait
wait-all
cancel
parallel
Loading