tegwick
642163a1ed
Assistant: codex Assistant-Model: gpt-6-astra Assistant-Session: 01a0cffe-206f-7323-89d3-b20ca4cf4bf9
1.8 KiB
| title | status | maturity | families | scales | admission | ||||
|---|---|---|---|---|---|---|---|---|---|
| Explicit Reconciliation | draft | hypothesis |
|
|
research-candidate-only |
Explicit Reconciliation
Context: two preserved versions express incompatible edits. Problem: selecting an
active version is not the same as deciding intended content. information-completeness
and recoverability compete with cognitive-load and continuity-of-interaction.
Proposed solution: expose the unresolved versions and provenance, let the user compare and choose or combine them, then save the decision as a new revision referencing both inputs. Where retention remains authorized, do not remove recovery copies before that decision has committed; access revocation can require earlier deletion and limit comparison. Announce conflicts without relying on color; support keyboard comparison and recoverable focus.
Result: semantic resolution is an explicit action which may itself need synchronization. Another device may concurrently resolve the same conflict; the new revision needs the same divergence checks as ordinary edits. Automatic merging is an alternative when its domain semantics are justified. Quiet remote-wins selection hides this decision.
Evidence: expansion review E07/E08 locates manual comparison in two products. Provenance, atomic commit, notification and accessible interaction requirements here remain unverified design proposals. This candidate may be the second half of Conflict Copy rather than a separate pattern; keep that open.
Proposed connection: Conflict Copy creates a context for reconciliation, not a mandatory implementation dependency. Compare without copies if a version store provides equivalent recoverability. Hypothesis; no FEP identity or canonical edges.