--- source_id: SRC-0006 title: Troubleshoot Obsidian Sync author: Obsidian Help locator: https://obsidian.md/help/sync/troubleshoot version: Living documentation accessed 2026-09-25; publication date and release revision unknown accessed: '2026-09-25' evidence_kind: primary excerpt_scope: Conflict-copy mechanism only; not whole-product validation --- # Bounded conflict-handling packet ## Editorial scope (not source text) Obsidian Sync is the implementation named in this document. Passage A describes the optional Create conflict file mode, not the default automatic-merge mode. Only block quotations below are original text. Other sections, screenshots, version details and recovery instructions are omitted. ## Passage A — Conflict resolution options, Create conflict file, first sentence fragment > it creates a separate conflict file instead of merging automatically. ## Passage B — Conflict file naming pattern, sentence following local-content description > The original file keeps the remote version. ## Research question (editorial) Does preserving an alternate copy separate synchronization from user resolution of conflicting intent? Identify supported behavior and limits. A single implementation cannot establish recurrence. Do not infer crash durability, automatic detection coverage, transactional correctness, or recovery guarantees from these fragments. Return no candidate if insufficient; illustrative hypotheses are not known uses.