adrozdenko/finishing-a-development-branch
packages/forge/src/skills/finishing-a-development-branch/SKILL.md
Use when the user says "finish branch", "merge branch", "ready to merge", "PR ready", "close branch", "submit PR", or wants to finalize a development branch for merge into the base branch.
$ install --global
skillsauthnpx skillsauth add adrozdenko/soleri finishing-a-development-branchInstall this skill globally with one command. Works with Claude Code, Cursor, and Windsurf.
Security Scan Results
3 of 9 scanners reported clean
Some scanners were skipped, did not run, or reported a non-clean status. Review each row below.
3
Scanners Passed
9
Scanners in report
Clean
TrivyContainer and dependency vulnerability scanner
95%
Clean
SemgrepStatic code analysis for vulnerabilities
95%
Clean
mcp-scan (Snyk)Model Context Protocol security validation
95%
Skipped
Snyk (dep)Open source security scanning
50%
Skipped
Socket.devSupply chain security analysis
50%
Skipped
VirusTotalMulti-engine malware detection
50%
Skipped
CrowdStrikeAdvanced threat intelligence
50%
Skipped
OSV-ScannerOpen Source Vulnerability database check
50%
Skipped
OWASP Dep-Check
50%
Last scanned: Mar 30, 2026, 6:20 AM36.5s1 file scanned
SKILL.md
- name:
- finishing-a-development-branch
- description:
- >
Finishing a Development Branch
Pre-merge checks, PR creation, merge strategy, and branch cleanup.
Announce at start: "I'm using the finishing-a-development-branch skill to prepare this branch for merge."
Step 1: Pre-Merge Checklist
Run all checks before creating a PR. Stop on any failure.
npm test # all tests pass
npx tsc --noEmit # typecheck clean
npm run lint # no lint errors (if configured)
Verify no uncommitted changes: git status should be clean. Commit or stash before proceeding.
Step 2: Create the Pull Request
- Push the branch:
git push -u origin <branch> - Create PR with
gh pr create:- Title: under 70 chars, conventional format (
feat:,fix:,refactor:) - Body: summary (what + why), test plan, breaking changes if any
- Reviewers: add if the user specifies or the repo has CODEOWNERS
- Labels/milestone: add if relevant
- Title: under 70 chars, conventional format (
Keep the description focused on why the change exists, not a file-by-file diff recap.
Step 3: Squash vs Merge Commit
| Signal | Strategy | Rationale | | -------------------------------- | ---------------- | --------------------------------- | | Many WIP/fixup commits | Squash | Clean history, one logical change | | Each commit is a meaningful unit | Merge commit | Preserves granular history | | Single commit on branch | Either | No difference | | Team convention exists | Follow it | Consistency wins |
Default to squash unless the user or repo convention says otherwise.
Step 4: Handle Merge Conflicts
If the base branch has diverged:
git fetch origin && git rebase origin/<base>— preferred, keeps history linear- Resolve conflicts file by file, run the full checklist (Step 1) again after resolving
git rebase --continueafter each resolution- If rebase is too complex,
git merge origin/<base>is acceptable — ask the user
Never force-push a rebased branch that others are working on.
Step 5: Branch Cleanup
After merge is confirmed:
git checkout <base> && git pullgit branch -d <branch>— delete local branch- If remote branch not auto-deleted:
git push origin --delete <branch>
Anti-Patterns
- Force-pushing to shared branches — destroys others' history; only force-push personal branches
- Merging without tests passing — broken main is worse than a delayed merge
- Giant PRs — split if touching 10+ files across unrelated concerns
- Empty PR descriptions — reviewers need context; "fixes stuff" is not a description
- Leaving stale branches — delete after merge; stale branches create confusion
Related skills: executing-plans, verification-before-completion
Related Skills
adrozdenko/soleri-terse
testing
VerifiedTrustedCommunity
Triggers: "terse mode", "be brief", "less tokens", "fewer tokens", "compress output", "caveman", or invokes /terse. Token-efficient responses with full technical accuracy.
6SKILL.mdUpdated Apr 15, 2026
adrozdenko/soleri-compress
tools
VerifiedTrustedCommunity
Triggers: "compress this file", "compress CLAUDE.md", "compress memory", "shrink this", "reduce tokens in file", or invokes /compress. Compresses natural language files to save input tokens.
6SKILL.mdUpdated Apr 15, 2026
adrozdenko/soleri-release
testing
VerifiedTrustedCommunity
Triggers: "release", "bump version", "publish packages", "cut a release", "version bump", "npm publish". Bumps monorepo versions, commits, tags, pushes to trigger CI release. Use deliver-and-ship for quality gates.
6SKILL.mdUpdated Apr 10, 2026
adrozdenko/soleri-orchestrate
development
VerifiedTrustedCommunity
Triggers: "implement X", "build Y", "fix Z", "add feature", or any work task needing planning + execution. Full orchestration loop: plan, execute, complete with vault context and brain recs.
6SKILL.mdUpdated Apr 10, 2026