Skip to content

[Do Not Merge] sample tests - merge conflicts test 2 #16561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shuyama1 wants to merge 1 commit into
base: update_test_branch_2
Choose a base branch
from
+20 −0

new example

36f544d
Select commit
Loading
Failed to load commit list.
Open

[Do Not Merge] sample tests - merge conflicts test 2 #16561

new example
36f544d
Select commit
Loading
Failed to load commit list.
Google CLA / cla/google succeeded Feb 27, 2026 in 8s

✅ All contributors are covered under a CLA with Google

See https://cla.developers.google.com/ for more info about Google's Contributor License Agreement (CLA).

ℹ️ Googlers: Go here to view more details and manage scans for this pull request.

Details

The following contributors were found for this pull request:

✅ 36f544d Author: @shuyama1 <sh****a​@google.com>

(Only the first commit for a unique contributor is listed.)

View more details on Google CLA