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.3 KiB

Raw Blame History

source_id	title	author	locator	version	accessed	evidence_kind	excerpt_scope
SRC-0005	What is a conflict?	Joplin project / Laurent Cozic	https://joplinapp.org/help/apps/conflict/	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)

Joplin is the implementation named in this document. The fragments concern detected conflicts in notes. Only block quotations below are original text. Other sections, screenshots, version details and recovery instructions are omitted.

Passage A — How to resolve a conflict?, first paragraph, first sentence fragment

it creates a Conflict notebook and copies the local note to it.

Passage B — same paragraph, second sentence

Then the remote note replaces the local note.

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.3 KiB Raw Blame History