Fix copy-merge to preserve locally-added files in upstream-deleted directories - #4720

Merged

efiacor merged 3 commits into

kptdev:mainfrom

Nordix:copy-merge-preserve-lf

Sep 2, 2026

Commits on Aug 31, 2026

Fix copy-merge to preserve locally-added files in upstream-deleted directories
kushnaidu
committed
49e5d3c
Add negative test for file deletes during copy-merge
kushnaidu
committed
a7fcba1

Commits on Sep 2, 2026

Update wording in comment
kushnaidu
committed
cdb5942