tegwick ad6f8fa600 Ground conflict-copy candidate in Joplin and Obsidian evidence

Assistant: codex
Assistant-Model: gpt-6-astra
Assistant-Session: 01a0cffe-206f-7323-89d3-b20ca4cf4bf9

2026-09-25 02:04:30 +02:00

1.4 KiB

Raw Blame History

source_id	title	author	locator	version	accessed	evidence_kind	excerpt_scope
SRC-0006	Troubleshoot Obsidian Sync	Obsidian Help	https://obsidian.md/help/sync/troubleshoot	Living documentation accessed 2026-09-25; publication date and release revision unknown	2026-09-25	primary	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.

1.4 KiB Raw Blame History