Update

1. Check for Uncommitted Work

git status --short

If tracked files are modified, stash them:

git stash push -u -m "update skill: stashing before merge"

2. List and Evaluate Renovate PRs

gh pr list --author "app/renovate" --json number,title,headRefName,statusCheckRollup

For each PR:

• Check CI status with gh pr checks <number>
• If all critical checks pass, prepare to merge
• If --dry-run, just report what would be merged

3. Merge Passing PRs

For each green PR:

gh pr merge <number> --squash --delete-branch

4. Fetch and Rebase

git fetch origin
git rebase origin/main

When conflicts occur:

1. Read the conflicted file
2. Resolution strategy:
   • Version conflicts: take newer version
   • New additions on both sides: keep both
   • Structural conflicts: favor incoming (Renovate) unless it breaks local additions
3. Edit to resolve, then: git add <file> && git rebase --continue

5. Pop Stash

If stashed earlier:

git stash pop

6. Push (if requested)

If --push in arguments:

git push origin <current-branch>

7. Preview and Apply Chezmoi

chezmoi diff

Show summary of changes, then apply:

chezmoi apply

8. Summary

Present a table:

Edge Cases

• No Renovate PRs: skip merge step, just rebase/apply
• All PRs failing: don't merge any, report to user
• Chezmoi template warning: normal after config changes, not an error