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

Jump to bottom

conflicts: materialize simplified conflicts for each file #3719

Merged
merged 8 commits into from
Jun 14, 2024

merge_tools: simplify file conflicts before attempting to resolve

0eb1efb
Select commit
Loading
Failed to load commit list.
Merged

conflicts: materialize simplified conflicts for each file #3719

merge_tools: simplify file conflicts before attempting to resolve
0eb1efb
Select commit
Loading
Failed to load commit list.
Google CLA / cla/google succeeded Jun 14, 2024 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:

✅ 0eb1efb Author: @bnjmnt4n <be****in​@dev.ofcr.se>

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

View more details on Google CLA