What problem does it solve? Pulling upstream changes into a chezmoi-managed dotfiles repo risks clobbering local work, mis-merging generated files, and confusing runtime drift with real repo changes. This Skill provides a safe, repeatable procedure for fetching, merging, validating, and editing a chezmoi source tree without breaking the live checkout. ## Core Features & Use Cases - Safe upstream pulls: Inspect incoming commits with git log/diff, predict conflicts by intersecting touched files with local dirty files, and merge inside a throwaway git worktree before fast-forwarding the live checkout. - Conflict resolution rules: Handle generated files by regenerating instead of hand-merging, resolve rename/rename conflicts by identifying redesigns, and distinguish repo drift from runtime drift in app-rewritten config files. - Validation gates: Run chezmoi apply --dry-run --force for a true non-interactive pass/fail, shellcheck touched shell modules, and respect run_onchange hook re-execution. - Use Case: After weeks away, you pull upstream dotfiles changes that renamed a config into .chezmoitemplates while you edited the old file locally; the Skill guides you to take the redesign, verify nothing stash-only was lost, and validate with a forced dry-run. ## Quick Start Ask the assistant to pull the latest upstream changes into my chezmoi dotfiles repo and resolve any conflicts safely using a worktree.
