Skip to content
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

merged_tree: don't add empty subtree to parent, remove canceling terms prior to resolving file-level conflict #2662

Merged
merged 2 commits into from
Dec 2, 2023

merged_tree: remove canceling terms prior to resolving file-level con…

1728342
Select commit
Loading
Failed to load commit list.
Merged

merged_tree: don't add empty subtree to parent, remove canceling terms prior to resolving file-level conflict #2662

merged_tree: remove canceling terms prior to resolving file-level con…
1728342
Select commit
Loading
Failed to load commit list.
Google CLA / cla/google succeeded Dec 2, 2023 in 1s

✅ 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:

✅ 1728342 Author: @yuja <y**a​@tcha.org>

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

View more details on Google CLA