Repository navigation
fix: take the laptop's versions - #50
Merged
Merged
Conversation
The laptop is the source, not chezmoi. Seven managed files had drifted: settings.json (seven amont-agent matchers, the relais hook path, the local proxy env), the worktree-sweep tool and skill (the content gate), a CLAUDE.md line, amont-agent stances in git config, a gitignore entry and two removed fish lines. git config also drops sslVerify = false, which an apply would have restored. Templates were patched, so their directives stand; rendered, each file equals the laptop's. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The person's rule: this laptop is the source, not chezmoi. Seven managed files had drifted, so a
chezmoi applywould have overwritten newer work with older text. This brings each source in line with the laptop.dot_claude/settings.json: seven amont-agent hook matchers, therelais hookpath (/usr/local/bin), and the local proxy settings (apiKeyHelperis a path to a local key file, never the key;ANTHROPIC_BASE_URLis localhost). No secret-shaped string is in the file.CLAUDE.md: the default-browser line.git config: the amont-agent stances, andsslVerify = falseremoved, which an apply would have turned back on.gitignore:.claude/.cc-writes/.fish/config.fish: the conda and Antigravity lines, which were removed on the laptop.The four templates were patched with the laptop's changes rather than overwritten, so every
{{ }}directive stands (directive counts 2, 1, 3 and 5, as before).Verification
Each of the seven files, rendered from this branch with
chezmoi --source <branch> cat, has 0 lines of difference from the laptop's file. As a control, the same check against the old source finds 3 differing lines ingitignore, so the check can fail.🤖 Generated with Claude Code