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
Install
sd0xdev/sd0x-dev-flow/merge-prep · repository language: JavaScript
git clone https://github.com/sd0xdev/sd0x-dev-flow
cp -r sd0x-dev-flow/skills/merge-prep ~/.claude/skills/merge-prepnpx skillfed install sd0xdev/sd0x-dev-flow/merge-prepFrequently 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)
Read as markdown · JSON record · Browse the source repository
File tree — 2 files
skills/merge-prep/SKILL.md
skills/merge-prep/scripts/pre-merge-check.sh