wave-branch-doc-paragraph-merge-conflict-union
Diagnosed and verified. Solution written to:
~/solution-wave-branch-doc-paragraph-merge-conflict-union.md
Root cause: Both wave branches rewrote the same contiguous paragraph in docs/QUICKSTART.md. Git's line-based three-way merge can't see that the edits are independent additive facts — LOGSEY-037 added LIKE token-anchoring semantics, LOGSEY-046 corrected the stale blanket BETWEEN refusal (BETWEEN works on ts, refused elsewhere) — so it emitted a pick-one-side conflict.
Fix: Content union, not --ours/--theirs. Inspect both sides with git show HEAD:<file> and git show <branch>:<file>, compose one paragraph carrying both claims plus the most-accurate refusal list, then git add + git commit --no-edit.
Verification (run end-to-end on a reconstructed repo):
- Zero conflict markers
- LIKE token-anchoring claim present
- Corrected BETWEEN claim present
- Stale blanket refusal removed
- Clean tree + two-parent merge commit
The document includes the exact resolved markdown, copy-paste commands, a one-shot verification script, the pitfall, and a generalized rule for wave paragraph merges.
# Evidence - Problem class: wave-branch-doc-paragraph-merge-conflict-union - Model: openrouter/deepseek/deepseek-v4.1-flash - Solved: 2026-09-28T00:29:25.469Z - Verification: solution produced by pi in sandbox; see signatures.json
{"description": "Two wave worker branches (LOGSEY-037 and LOGSEY-046) each rewrote the same 'Today's engine is an honest subset of SQL' capability paragraph in docs/QUICKSTART.md from the same base: one added message-LIKE token-anchoring wording, the other corrected a stale ts BETWEEN refusal claim. git merge cannot auto-union overlapping paragraph rewrites.", "environment": "git merge of two worker branches that both rewrote the same capability paragraph", "language": "markdown", "model": "openrouter/deepseek/deepseek-v4.1-flash", "problem_class": "wave-branch-doc-paragraph-merge-conflict-union", "provider": "openrouter", "solved_at": "2026-09-28T00:29:25.473Z", "version": ""}Diagnosed and verified. Solution written to:
~/solution-wave-branch-doc-paragraph-merge-conflict-union.md
Root cause: Both wave branches rewrote the same contiguous paragraph in docs/QUICKSTART.md. Git's line-based three-way merge can't see that the edits are independent additive facts — LOGSEY-037 added LIKE token-anchoring semantics, LOGSEY-046 corrected the stale blanket BETWEEN refusal (BETWEEN works on ts, refused elsewhere) — so it emitted a pick-one-side conflict.
Fix: Content union, not --ours/--theirs. Inspect both sides with git show HEAD:<file> and git show <branch>:<file>, compose one paragraph carrying both claims plus the most-accurate refusal list, then git add + git commit --no-edit.
Verification (run end-to-end on a reconstructed repo):
- Zero conflict markers
- LIKE token-anchoring claim present
- Corrected BETWEEN claim present
- Stale blanket refusal removed
- Clean tree + two-parent merge commit
The document includes the exact resolved markdown, copy-paste commands, a one-shot verification script, the pitfall, and a generalized rule for wave paragraph merges.
# Evidence - Problem class: wave-branch-doc-paragraph-merge-conflict-union - Model: openrouter/deepseek/deepseek-v4.1-flash - Solved: 2026-09-28T00:29:25.469Z - Verification: solution produced by pi in sandbox; see signatures.json
{"description": "Two wave worker branches (LOGSEY-037 and LOGSEY-046) each rewrote the same 'Today's engine is an honest subset of SQL' capability paragraph in docs/QUICKSTART.md from the same base: one added message-LIKE token-anchoring wording, the other corrected a stale ts BETWEEN refusal claim. git merge cannot auto-union overlapping paragraph rewrites.", "environment": "git merge of two worker branches that both rewrote the same capability paragraph", "language": "markdown", "model": "openrouter/deepseek/deepseek-v4.1-flash", "problem_class": "wave-branch-doc-paragraph-merge-conflict-union", "provider": "openrouter", "solved_at": "2026-09-28T00:29:25.473Z", "version": ""}