backport: Merge bitcoin#28725, 28771, 28814, 28546, 28076, 28741, 28727, 22764#7280
Open
vijaydasmp wants to merge 8 commits into
Open
backport: Merge bitcoin#28725, 28771, 28814, 28546, 28076, 28741, 28727, 22764#7280vijaydasmp wants to merge 8 commits into
vijaydasmp wants to merge 8 commits into
Annotations
3 warnings
|
check for potential conflicts
Potential conflicts detected!
|
|
check for potential conflicts
{
pull_number: 7280,
conflictPrs: [
{
number: 6182,
files: [
'src/governance/common.cpp',
'src/governance/common.h',
'src/governance/governance.cpp',
'src/governance/object.cpp',
'src/governance/object.h',
'src/interfaces/node.h',
'src/rpc/governance.cpp',
'src/wallet/wallet.cpp',
'src/wallet/wallet.h',
'test/functional/feature_governance.py',
'test/functional/feature_governance_cl.py',
'test/functional/feature_governance_objects.py',
'test/functional/interface_zmq_dash.py',
'test/functional/test_framework/governance.py',
'test/functional/test_framework/messages.py'
],
conflicts: [ 'src/wallet/wallet.cpp', 'src/wallet/wallet.h' ]
},
{
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: [ 'Makefile.am', 'ci/lint/04_install.sh' ]
},
{
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.py',
'test/lint/lint-locale-dependence.py',
'test/lint/lint-python-utf8-encoding.py',
'test/lint/lint-python.py',
'test/lint/lint-shell-locale.py',
'test/lint/lint-shell.py',
'test/lint/lint-spelling.py',
'test/lint/lint-whitespace.py'
],
conflicts: [
'Makefile.am',
'contrib/guix/symbol-check.py',
'src/Makefile.qt.include',
'test/lint/lint-files.py',
'test/lint/lint-include-guards.py'
]
},
{
number: 6207,
files: [
'doc/release-notes-6207.md',
'src/rpc/node.cpp',
'test/functional/feature_multikeysporks.py',
'test/functional/feature_sporks.py',
'test/functional/test_framework/test_framework.py'
],
conflicts: [ 'test/functional/test_framework/test_framework.py' ]
},
{
number: 7220,
files: [
'Makefile.am',
'ci/lint/04_install.sh',
'ci/test/00_setup_env_native_nowallet.sh',
'configure.ac',
'contrib/containers/ci/ci-slim.Dockerfile',
'depends/packag
|
|
check for potential conflicts
Unexpected input(s) 'ghToken', valid inputs are ['entryPoint', 'args', 'github-token']
|
background
wait
wait-all
cancel
parallel
Loading