{"enrichment":{"faq":[{"a":"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.","q":"What does merge-prep do before merging branches?"},{"a":"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.","q":"Can merge-prep detect merge conflicts automatically?"},{"a":"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.","q":"Will this merge have conflicts between my branches?"},{"a":"merge-prep is analysis-only in v1\u2014it 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.","q":"Does merge-prep execute the merge or just analyze it?"},{"a":"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.","q":"What information does merge-prep's analysis report include?"}],"shadow_tags":["conflict-detection","pre-flight-checks","branch-analysis","merge-safety","git-workflow","impact-assessment","merge-strategy","dry-run-merge","commit-analysis"],"summary_rewrite":"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\u2014no automatic merging, pushing, or committing."},"files":[{"bytes":5488,"path":"skills/merge-prep/SKILL.md","sha256":"d8825cf56487f3c045fd2cc1b1803ed7989c3de1f25e14c194c16568d87460d3","url":"https://skillfed.io/files/sd0xdev/sd0x-dev-flow/merge-prep/dbdbadf3/SKILL.md"}],"id":"sd0xdev/sd0x-dev-flow/merge-prep","links":{"html":"https://skillfed.io/sd0xdev/sd0x-dev-flow/merge-prep","md":"https://skillfed.io/sd0xdev/sd0x-dev-flow/merge-prep.md","repo":"https://github.com/sd0xdev/sd0x-dev-flow"},"meta":{"agents_supported":[],"first_seen":"2026-07-28","forks":23,"language":"JavaScript","last_updated":"2026-07-27","license":"MIT","name":"merge-prep","publisher":"sd0xdev","stars":176},"relations":{"similar":[{"id":"sd0xdev/sd0x-dev-flow/epic-merge"},{"id":"sd0xdev/sd0x-dev-flow/smart-rebase"},{"id":"sd0xdev/sd0x-dev-flow/smart-commit"},{"id":"sd0xdev/sd0x-dev-flow/push-ci"},{"id":"Mathews-Tom/armory/stacked-prs"},{"id":"troykelly/claude-skills/verification-before-merge"},{"id":"sd0xdev/sd0x-dev-flow/pr-summary"},{"id":"pedronauck/skills/git-rebase"},{"id":"catlog22/maestro-flow/maestro-merge"},{"id":"geoffjay/claude-plugins/git-advanced"}]},"slug":{"owner":"sd0xdev","repo":"sd0x-dev-flow","skill":"merge-prep"},"version":"dbdbadf3"}