…lvanocerza#22 Decision silvanocerza#22 (Reset → rename siblings to *.unresolved-*): - ConflictStore.renameVaultSiblingsToUnresolved() walks the vault and renames `*.conflict-from-<dev>-<isoTs>.<ext>` siblings to `*.unresolved-<isoTs>.<ext>`, dropping the device-label segment so a re-enable on a different device can't collide with prior artifacts. - Pure helper unresolvedNameFor() anchors on buildSiblingPath's exact iso-timestamp shape; non-matching filenames return null. - main.ts:resetPluginState() calls the rename BEFORE clearAll(); the repo-switch path still skips it (siblings stay as live conflicts against the new remote). - 11 new unit tests in conflict-store.test.ts: 6 instance-method (regular ext, hidden file, extensionless, multi-sibling, ignore non-matching, mobile rename-throws safety) + 5 pure helper cases. Decision silvanocerza#19 (branch prefix derived from plugin id): - CONFLICT_BRANCH_PREFIX = `${manifest.id}-conflicts-` → `github-easy-sync-conflicts-` instead of bare `easy-sync-conflicts-`. Reconciles the doc's Decision silvanocerza#19 wording with code. - Existing installs with active branches under the old prefix become orphans (per Decision silvanocerza#23) — sole-user constraint (Decision silvanocerza#24) means no migration path needed; finalize before upgrade if active. - Comments + tests across conflict-branch / snapshot-store / branch-lifecycle integration updated to the new prefix. Incidental polish bundled in: - settings/tab.ts: "Settings > Files and links" → "Settings (Options) > Files and links" — disambiguates for mobile where the menu label differs. - sync2/gitignore-invariants.ts: ROOT_RECOMMENDED_DEFAULTS gains more OS-noise + trash-can entries (.AppleDouble, .LSOverride, Icon, ._*, ehthumbs.db, $RECYCLE.BIN/, .trash/, .trashed-*). Tests: 525/525 unit pass (was 514, +11). Build clean. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Allow ignoring folders from sync #19

Description

Metadata

Metadata

Assignees

Labels

Projects

Milestone

Relationships

Development

Issue actions