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

Fix propagation of conflict resolution with tree-level conflicts #2287

Merged
merged 2 commits into from
Sep 28, 2023

tree: simplify conflict before resolving at hunk level

51b5d16
Select commit
Loading
Failed to load commit list.
Merged

Fix propagation of conflict resolution with tree-level conflicts #2287

tree: simplify conflict before resolving at hunk level
51b5d16
Select commit
Loading
Failed to load commit list.
Google CLA / cla/google succeeded Sep 28, 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:

✅ 51b5d16 Author: @martinvonz <mar*****nz​@google.com>

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

View more details on Google CLA