Tyre (architecture review): - .gitattributes: `.pql/changelog/*.sql` matched nothing (files are one level deeper at .pql/changelog/<table>/<YYYY-MM>.sql), so the union-merge driver never applied — `git check-attr merge` returned `unspecified`. Fixed to `.pql/changelog/**/*.sql`; now resolves to `merge: union` for monthly + schema files. Restores the changelog's conflict-free merge guarantee. - Migration scripts: the re-runnable ones (seed_tickets.py, add_workshop_provenance.py) now derive the repo root from `git rev-parse --show-toplevel` instead of a hardcoded /main path, so re-running from a worktree/clone targets the right checkout. The three one-shot transforms (restructure_decisions, repath_references, retag_ticket_refs) get a comment noting they're already-applied and unsafe to re-run (git mv on moved sources) — keeping the path honest rather than implying re-runnability. Hoshe approved (all QA checks passed). ruff clean. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2 lines
36 B
Plaintext
2 lines
36 B
Plaintext
.pql/changelog/**/*.sql merge=union
|