Repository navigation
🐛 Fixed
Tracked Deletion vs. Missing File Distinction: Fixed an edge-case bug in evaluate_file where missing target files were unconditionally matched as (_, None) => MissingInTarget, causing apply --write to resurrect intentionally deleted files even under KeepLocal sync strategy.
Delete/Modify Conflict Detection: Upstream modifications to locally deleted files now correctly trigger a 3-way BothChangedConflict (delete/modify conflict) requiring explicit resolution (driftsync resolve) instead of silently recreating the file.
✨ Added
DriftStatus::LocallyDeleted: New status badge (🛡️ LOCALLY-DELETED (KEPT)) that preserves intentional local file deletions when upstream has not changed (theirs == base).
ADR-006: Documented Tracked Deletion & Delete/Modify Conflict Handling in DECISIONS.md and updated Section 2 Drift Classification Matrix in SPEC.md.
End-to-end integration tests in workspace_flow.rs and unit tests in driftsync-core verifying local deletion preservation and delete/modify resolution.
💖 Community Credits & Special Thanks
Huge shoutout and special thanks to Reddit community members /u/MongooseWonderful198
and /u/Steel_half2
for in-depth source code review on crates/driftsync-core and identifying this 3-way merge edge case!