Skip to content

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

Draft
iamhyc wants to merge 1 commit into
masterfrom
fix/three-way-merge-conflicts
Draft

fix(merge): replace two-way DMP patch with proper three-way merge — prevents silent data loss on conflict (#353, #180)#375
iamhyc wants to merge 1 commit into
masterfrom
fix/three-way-merge-conflicts

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

Annotations

1 warning

The logs for this run have expired and are no longer available.