chore: Resolve merge conflicts

0e005ed

Select commit

Loading

Failed to load commit list.

Uh oh!

There was an error while loading. Please reload this page.

Google Cloud Build

Test-Samples-java-bigquery (cloud-java-ci-sample)

Test-Samples-java-bigquerystorage (cloud-java-ci-sample)

Test-Samples-java-bigtable (cloud-java-ci-sample)

Test-Samples-java-datastore (cloud-java-ci-sample)

Test-Samples-java-logging (cloud-java-ci-sample)

Test-Samples-java-pubsub (cloud-java-ci-sample)

Test-Samples-java-storage (cloud-java-ci-sample)

jdbc-presubmit-it (bigquery-devtools-drivers)

Conventional Commit Lint GCF

conventionalcommits.org

License Header Lint GCF

header-check

Google CLA

cla/google

Snippet Bot

snippet-bot check

GitHub Actions Scan on: pull_request_target 2

check-changes

zizmor-config

zizmor-scan

zizmor-upload

zizmor-output

multi-approvers on: pull_request_target 1

multi-approvers

java-bigtable ci on: pull_request 1

filter

units

units (8)

windows

dependencies

javadoc

lint

clirr

Librarian - Showcase Version Check on: pull_request 1

filter

check-showcase-version

CHANGELOG.md generation upon Release Please pull requests on: pull_request

print-github-context

changelog-generation

java-firestore ci on: pull_request 1

filter

units

units (8)

windows

dependencies

javadoc

lint

clirr

versions check on: pull_request 1

unmanaged-versions-check

existing-versions-check

Google GitHub Admin: Actions Workflow Security Scan on: pull_request 2

scan-pr

java-spanner-jdbc Integration tests against emulator on: pull_request 1

filter

tests-against-emulator

java-spanner-jdbc ci on: pull_request 1

filter

units

units (8)

windows

dependencies

javadoc

lint

conditional-required-check

sdk-platform-java Unmanaged dependency check on: pull_request 2

unmanaged_dependency_check

java-spanner-jdbc quickperf on: pull_request 1

filter

quickperf

sdk-platform-java on: pull_request 1

filter

sdk-platform-java units

clirr

dependencies

sdk-platform-java units (8)

sdk-platform-java integration

sdk-platform-java integration (JDK 24+)

sdk-platform-java self-service clients

gapic-generator-java (8)

java8-compatibility

gapic-generator-java-bom

unmanaged_dependency_check

dependency_analyzer_unit_test

java-shared-config downstream (maven-plugins) on: pull_request 1

filter

build

lint

javadoc-with-doclet

java-pubsub ci on: pull_request 1

filter

units

units (8)

windows

dependencies

javadoc

lint

clirr

java-spanner-jdbc samples on: pull_request 1

filter

test

sdk-platform-java Downstream Protobuf Compatibility Check Nightly on: pull_request

setup

downstream-protobuf-test

sdk-platform-java SonarCloud Build on: pull_request 1

filter

Build

sdk-platform-java Downstream Unmanaged Dependency Check on: pull_request 1

filter

validate

conditional-required-check

java-shared-config downstream (dependencies) on: pull_request 1

filter

dependencies

flatten-plugin-check

Repository Config & Code Sanity on: pull_request 4

gitignore_correctness

generate-readme

group_id_check_for_maps_libraries

package_name_check

java-bigquery-jdbc ci on: pull_request 1

filter

units

units (8)

windows

dependencies

javadoc

lint

conditional-required-check

java-bigtable conformance on: pull_request 1

filter

conformance

Librarian - Formatter Version Check on: pull_request 1

Filter changed files

Check Formatter Version

google-auth-library-java ci on: pull_request 1

filter

units-logging

clirr

dependencies

conditional-required-check

java-spanner-jdbc spring-data-mybatis-sample on: pull_request 1

filter

spring-data-mybatis

showcase on: pull_request 1

filter

showcase (8)

showcase

showcase-clirr

conditional-required-check

sdk-platform-java Dependency Compatibility Test on: pull_request 1

filter

dependency-compatibility-test

java-spanner-jdbc spring-data-jdbc-sample on: pull_request 1

filter

spring-data-jdbc

java-shared-config ci on: pull_request 1

filter

units

units (8)

windows

dependencies

javadoc

lint

clirr

sdk-platform-java Downstream Check on: pull_request 1

filter

downstream-compatibility

downstream-compatibility (spring-cloud-gcp)

conditional-required-check

ci on: pull_request 23

bulk-filter

units (11)

units (17)

units (21)

units (25)

units (26)

units (8)

changes

windows

lint

enforcer

gapic-libraries-bom

conditional-required-check

java-storage-nio ci on: pull_request 1

filter

units

units (8)

windows

dependencies

javadoc

lint

conditional-required-check

java-spanner integration-tests-against-emulator on: pull_request 1

filter

units

java-cloud-bom ci on: pull_request 57

filter

dependencies (17)

bom-content-test

BomContentAssertionsTest (Test for assertion logic in BomContentTest)

test-invalid-bom

dashboard

shared-dependencies-convergence

chore: Resolve merge conflicts

Uh oh!

Select a check to view from the sidebar