# Prepare Merge > Clean up code and prepare documentation before merging a feature branch. Use when this capability is needed. - Skill: `tomevault-io/prepare-merge` (Agent Skill, multi-file: 2 files) - Install (CLI): `npx skillmds@latest add tomevault-io/prepare-merge` - Raw SKILL.md: https://api.skillmd.com/api/skills/tomevault-io/prepare-merge/raw - Safety review: pending (external: skill-scanner PASS, skillspector PASS) - Works with: Claude Code, Claude.ai, OpenAI Codex - Category: Docs & Writing - Author: tomevault-io (https://skillmd.com/u/tomevault-io) - Updated: 2026-09-17 - Page: https://skillmd.com/skills/tomevault-io/prepare-merge --- **Arguments:** Specify the target branch to compare against (default: `dev`) Follow these steps: ## 0. Ensure You're on a Branch If you're in a worktree on a detached HEAD, create a branch for your changes and commit before proceeding. ## 1. Analyze Branch Changes - Run `git log ..HEAD --oneline` to see commits - Run `git diff ..HEAD --stat` to see changed files - Read key changed files to understand what was implemented - Summarize the features/changes in the branch ## 2. Clean Up Code Now that the feature works correctly, review the branch changes for cleanup opportunities before merging: - **Rewrite for elegance:** Look at the solution holistically and consider if it can be expressed more cleanly now that you understand the full picture - **Remove dead code:** Delete any unused functions, variables, imports, or commented-out code - **Remove slop:** Inline single-use functions, strip overly defensive code, remove chronological comments, cut YAGNI violations (see CLAUDE.md for the full slop definition) - **Consolidate:** Merge redundant logic, reduce duplication, simplify overly abstracted code Only clean up code touched by this branch. Don't refactor unrelated areas. Run tests after cleanup to confirm nothing broke. ## 3. Update docs/changelog.mdx - Add entries to the "Unreleased" section - Use these prefixes: - `Added:` for new features - `Changed:` for modifications - `Fixed:` for bug fixes - `Tests:` for test changes - Write concise descriptions (1-2 sentences) - Don't duplicate existing entries ## 4. Update Documentation (If Needed) Review if changes require updates to: - `docs/` directory (Mintlify docs) - `README.md` **Update docs when:** - New user-facing features were added - Existing feature behavior changed - New CLI flags or API endpoints were added **Skip docs for:** - Internal refactoring - Bug fixes without behavior changes - Test-only changes When updating, write docs as if they're the current state - don't mention "updated" or "changed from". ## 5. Run Tests - Run tests and ensure all tests pass. (Use `-n auto` to run tests in parallel) - If tests fail, fix them and re-run until all tests pass ## 6. Summary Report: - What features/changes were found - What documentation was updated - What was skipped and why - The final merge skill command: `/merge ` ## 7. Update Project Board If working on a GitHub issue, move the issue to **Ready 2 Merge** on the project board. See the "GitHub Projects Workflow" section in CLAUDE.local.md for the `gh` commands and option IDs. --- > Converted and distributed by [TomeVault](https://tomevault.io/claim/camronh) — claim your Tome and manage your conversions.