mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-11 05:06:36 +00:00
Every conflicted hunk resolves onto the swarm-nfs side, because on all six files it is the strict superset: it carries the display-name codec (utils/roles/display.py) the CI role selections now encode through, and the sequencing glyph move from910748ec4. svc-net-tor holds no unique content on any of them -- runs.py even had non-conflicted hunks already calling `codec`, so keeping its side would have left a NameError. The lint fallout is settled in the same commit, as4afc9b770did for the previous merge: the shell-or-true lint lives on svc-net-tor (c505ce746) and swarm-nfs brings two unmarked `|| true` sites with it. Both get a nocheck reason rather than a rewrite, because neither swallows anything -- the slaptest call is the measured exception ofc4bbbba93and has_cn_config decides right below it, and the dockerd restart is followed by an is-active poll that fatals. In both the exit code was never the authority. make quality green end to end. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>