Skip to content

fix(skills): merge-when-green keeps step 6 - #25

Merged
fredericrous merged 1 commit into
mainfrom
fix/merge-when-green-step6
Oct 8, 2026
Merged

fredericrous merged 1 commit into
mainfrom
fix/merge-when-green-step6

Conversation

@fredericrous

Copy link
Copy Markdown
Owner

Step 6 of merge-when-green (fast-forward the live checkout after a merge, plus its pointer from the Forgejo section) existed only in the installed ~/.claude/skills/merge-when-green/SKILL.md, edited there on 2026-10-04. It never reached this source, so chezmoi apply of #23 would have deleted it. This ports it verbatim.

Verification: the rendered template now differs from the installed file only by #23's new description line; make check ok.

🤖 Generated with Claude Code

Step 6 (fast-forward the live checkout after a merge) was edited into
the installed skill on 2026-10-04 and never reached this source, so
the next chezmoi apply would have deleted it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@fredericrous
fredericrous merged commit 95a7450 into main Oct 8, 2026
2 checks passed
@fredericrous
fredericrous deleted the fix/merge-when-green-step6 branch October 8, 2026 18:10
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