Skip to content

chore: remove mergiraf merge driver and feature skill - #209

Merged
paveg merged 1 commit into
mainfrom
chore/remove-mergiraf-and-feature-skill
Jul 25, 2026
Merged

paveg merged 1 commit into
mainfrom
chore/remove-mergiraf-and-feature-skill

Conversation

@paveg

@paveg paveg commented Jul 25, 2026

Copy link
Copy Markdown
Owner

Summary

  • Remove the mergiraf syntax-aware merge driver: devbox package, dot_config/git/attributes, and the related git config in main.tmpl
  • Remove the unused feature skill (dot_claude/skills/feature/SKILL.md)

Test plan

  • just test passes
  • just diff shows no unexpected pending changes after chezmoi apply

🤖 Generated with Claude Code

Drop the mergiraf syntax-aware merge driver (devbox package, git attributesfile, and merge config) and the feature-development skill, none of which are in active use.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
@changeset-bot

changeset-bot Bot commented Jul 25, 2026

Copy link
Copy Markdown

⚠️ No Changeset found

Latest commit: ebab30f

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@paveg
paveg enabled auto-merge (squash) July 25, 2026 13:56
@paveg
paveg merged commit ee6c3a6 into main Jul 25, 2026
10 checks passed
@paveg
paveg deleted the chore/remove-mergiraf-and-feature-skill branch July 25, 2026 13:56
paveg added a commit that referenced this pull request Oct 20, 2026
* chore(chezmoi): remove ten deployed copies whose sources are gone

Each source was deleted before check-chezmoiremove.sh existed, so chezmoi
left the deployed copy behind. .config/git/attributes is the only one still
read: git loads it from the XDG default and it routes 32 extensions to the
mergiraf driver removed in #209.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* chore(chezmoi): state why the orphaned targets are removed, not when

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant