Allow file syncing during conflict resolution#595

Open

huntercaron wants to merge 11 commits intomainfrom

huntercaron/sync-during-conflict

Commits on Mar 19, 2026

Allow file syncing and live conflict updates during conflict resolution
huntercaron
committed
Fix set-mode guard blocking plugin close during conflict resolution
huntercaron
committed
Fix biome formatting for set-mode conflict resolution guard
huntercaron
committed

Commits on Mar 23, 2026

Remove idle exemption from set-mode guard, dispatch clear-conflicts on sync-complete
huntercaron
committed
Enable delete/rename confirmations during conflict resolution
huntercaron
committed
Fix log message to accurately describe sync-complete behavior
huntercaron
committed
Merge local file deletes into conflict resolution panel
huntercaron
committed
Replace non-null assertions with reduce for eslint compliance
huntercaron
committed
Fix biome formatting in code-link App.tsx
huntercaron
committed
Wait for pending user prompts before sending sync-complete
huntercaron
committed
Merge origin/main into huntercaron/sync-during-conflict
huntercaron
committed