merge-prep
merge-prep examines source and target branches side-by-side to identify conflicts, affected files, and commit differences. It generates a detailed analysis report with conflict resolution strategies and suggested merge commands for you to execute manually. v1 is analysis-only—no automatic merging, pushing, or committing.
merge-prep analyzes source and target branches to detect conflicts and generate merge commands for manual execution.
AI-generated summary based on this skill's SKILL.md
Decision gist · record as of 2026-07-27
merge-prep analyzes source and target branches to detect conflicts and generate merge commands for manual execution. merge-prep examines source and target branches side-by-side to identify conflicts, affected files, and commit differences. It generates a detailed analysis report with conflict resolution strategies and suggested merge commands for you to execute manually. v1 is analysis-only—no automatic merging, pushing, or committing.
Use it when
- Yes.
- merge-prep performs a pre-merge analysis to check if your branches can merge and predict conflicts.
Verify before relying
Read SKILL.md below before installing (2 files). Open directory: indexed for reading, not audited.
Similar skills
Install
sd0xdev/sd0x-dev-flow/merge-prep · repository language: JavaScript
Open directory. Skills are indexed for reading, not audited. Review a skill's body before installing it.
Frequently asked questions
AI-generated answers based on this skill's SKILL.md and metadata
What does merge-prep do before merging branches?
merge-prep examines your source and target branches side-by-side to identify conflicts, affected files, and commit differences without executing any merge. It generates a detailed analysis report with conflict resolution strategies and suggested merge commands for you to execute manually.
Can merge-prep detect merge conflicts automatically?
Yes. merge-prep analyzes source vs target branch content to detect and understand merge conflicts before you attempt the actual merge. It provides conflict prediction and resolution suggestions so you can prepare strategies in advance.
Will this merge have conflicts between my branches?
merge-prep performs a pre-merge analysis to check if your branches can merge and predict conflicts. It examines commit and file impact stats to answer whether merging will create conflicts, letting you decide whether to proceed or resolve issues first.
Does merge-prep execute the merge or just analyze it?
merge-prep is analysis-only in v1—it does not automatically merge, push, or commit. It generates merge commands with conflict resolution suggestions that you review and execute manually, giving you full control over the merge process.
What information does merge-prep's analysis report include?
merge-prep's pre-merge analysis report includes commit differences, affected files, conflict zones, and file impact statistics between your source and target branches. It also provides conflict resolution strategies and suggested merge commands ready for your manual execution.
SKILL.md
Rendered from the published skill. Quoted content, verbatim.
Merge Prep — Pre-merge Analysis and Preparation
Analyze source branch vs target branch, detect conflicts, output analysis report with suggested commands. v1 is analysis-only — does not execute merge/commit/push.
When NOT to Use
| Scenario | Use Instead |
|---|---|
| Commit code (not merge) | /smart-commit |
| Merge to main (production) | Manual PR flow |
| Just view diff | git diff <target>..<branch> |
| Rebase or squash | Manual operation |
Input
/merge-prep <source-branch> [--target <branch>]
<source-branch>: Branch to merge (required)--target: Target branch (default:{TARGET_BRANCH}ormain)
Workflow
```mermaid sequenceDiagram participant C as Claude participant U as User C->>C: Step 1: Validate prerequisites C->>C: Step 2: Pre-merge analysis
(truncated - see the full file via the links below)
File tree — 2 files
skills/merge-prep/SKILL.md
skills/merge-prep/scripts/pre-merge-check.sh
Let your AI agent find skills like this
Example. Real query, live index.
You found this page by searching. An agent finds it by wishing: SkillFed indexes 56,283 agent skills by what they can do, searchable in plain language.
wish › “Analyze source and target branches for conflicts before merging”
Give your agent the search over MCP, or paste the wish link into any chat. No install? Search from any chat →
Related skills
Smart Commit examines your uncommitted changes, organizes them into logically cohesive groups, and generates commit messages that match your project's style conventions. By default it outputs git commands for manual review; use the `--execute` flag to run commits directly after confirmation.
Examine how analyst estimates and revenue forecasts are shifting over time using Yahoo Finance data. See consensus levels, revision direction, and whether analysts are raising or cutting numbers—plus how actual results have compared to past estimates.
Create Commit analyzes your staged changes and generates properly formatted conventional commits, automatically inferring commit type and scope from the diff. It detects breaking changes and flags potential secrets before committing, while enforcing pre-commit hooks to maintain code quality standards.
Earnings Preview assembles a structured briefing before earnings reports, pulling consensus estimates, analyst sentiment, price targets, and your company's track record of beating or missing expectations. Get everything needed to understand what the street expects in one view.
understand-diff compares your code changes to the project's knowledge graph, surfacing which components were modified and what else might be impacted. It traces dependencies and cross-layer concerns to highlight potential risks, then generates a diff overlay for visual exploration in the dashboard.
Commit Summary analyzes staged or unstaged git changes and generates properly formatted Conventional Commit messages with the right type, scope, and breaking-change markers. It groups unrelated changes into logical commits, detects unsafe files, and can stage and create commits after your approval.