Skip to content

fix(merge): replace two-way DMP patch with proper three-way merge — prevents silent data loss on conflict (#353, #180) #375

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

Draft
iamhyc wants to merge 1 commit into
base: master
Choose a base branch
from

fix(merge): replace 2-way DMP patch with proper 3-way merge (diff3)

776073f
Select commit
Loading
Failed to load commit list.
Sign in for the full log view
Draft

fix(merge): replace two-way DMP patch with proper three-way merge — prevents silent data loss on conflict (#353, #180) #375

fix(merge): replace 2-way DMP patch with proper 3-way merge (diff3)
776073f
Select commit
Loading
Failed to load commit list.

Annotations

1 warning
Analyze (actions)
succeeded May 10, 2026 in 40s