mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-08 19:56:53 +00:00
kevinveenbirkenbachandClaude Opus 5
bf5aa1abd8
Two conflicts, both resolved by combining rather than by picking a side. `roles/web-app-socialhome/tasks/02_design.yml`: designer restructured the pass, moving the token request and the theme write into the new `02_design/converge.yml` and adding a stat of the name-state file. HEAD still carried the converge block inline. Kept designer's stat, dropped HEAD's inline block: the merged body below the conflict already includes `converge.yml` and reads `socialhome_name_marker`, which only designer defines, so keeping HEAD's side would have duplicated the token request and left that variable undefined. HEAD's `retries: 0` on the token request is deliberately not carried over; the default of 30 retries covers a service that is not yet accepting connections, which matters more here than failing fast on bad credentials. `roles/web-app-fider/files/playwright/test-design.js`: the import line takes both sides, since the merged body uses designer's `apiGetOnion` and HEAD's `requireDotenvValue`. The env block keeps HEAD's `requireDotenvValue` form, because designer's `|| ""` defaults are what `tests/lint/ansible/.../test_unguarded_env_default.py` exists to reject, and drops HEAD's module-scope `title` and `logoEnabled`: the merged body defines `title` locally and reads `DESIGN_LOGO_ENABLED` directly, so both were dead and would fail `no-unused-vars`. Checked after resolution: no conflict markers (`git diff --check`), no `nocheck` line dropped by the merge, and no duplicated YAML key in the seven merged files. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>