merge-prep
Skill2 starsChanged 7 days agoMITView on GitHub
Prepare a read-only branch merge analysis with native git merge-tree conflict detection and copy-pasteable manual commands. Use when deciding whether to merge one branch into another. Not for: checkout, merge, rebase, conflict edits, or branch mutation. Output: commits, files, conflicts, evidence, and manual commands.
3 other projects use a version of this.
Adopted by
Most recently taken up by
- cypher0n3/dotagentstheir own version, first seen Oct 11, 2026
- sd0xdev/sd0x-dev-flowtheir own version, first seen Oct 8, 2026
- sd0xdev/sd0x-harnesstheir own version, first seen Oct 6, 2026
Other versions3 projects use a version of this.
Word for word · 0
None found.
Edited · 0
None found.
Wrote their own version · 3
- sd0xdev/sd0x-dev-flow★ 192same name
- sd0xdev/sd0x-harness★ 192same name
- cypher0n3/dotagents★ 3same name
How matches are found. Word for word: the exact same text. Edited: shares passages with this file (“99% same” means 99% of its five-word phrases also appear here; 10% or more counts). Their own version: similar meaning, or, weakest, the same name. We can’t tell which project had it first. Projects are counted among the 200 most-starred candidates, and mentions are links to the repository we found, up to 50 per site, so both counts are a floor.
In this repository39 other files it gives its agents.
- AGENTS.mdAGENTS.md
- change-verdictSkill
- code-simplifySkill
- code-traceSkill
- create-prSkill
- deploy-listSkill
- doc-maintainSkill
- feature-verifySkill
- flow-driveSkill
- flow-guideSkill
- git-smart-commitSkill
- git-worktreeSkill
- harness-setupSkill
- issue-analyzeSkill
- js-static-checksSkill
- laravelSkill
- legacy-characterization-testsSkill
- library-authorSkill
- module-designSkill
- nextjsSkill
- openspec-artifact-guardSkill
- opsx-apply-resumeSkill
- phpSkill
- phpunitSkill
- precommitSkill
- project-auditSkill
- project-briefSkill
- proposal-analyzeSkill
- pr-summarySkill
- pythonSkill
- reactSkill
- release-creatorSkill
- repo-intakeSkill
- repo-verifySkill
- swiftSkill
- tdd-workflowSkill
- ui-ux-verifySkill
- vue-2-notesSkill
- yii1Skill
The file
We split this skill into the rules it gives an agent
1 rule. 0 are common, 0 are distinctive, and 1 is very specific to this project.
0
Common
Most of the 3 edited versions we read keep these.
0
Distinctive
This author's own choices. Worth a look.
1
Very specific
Tied to their project's names, files or tools. Probably skip.
- Common
- Distinctive
- Very specific
- Very specific: line 17
Use native, read-only Git evidence: merge-base, commit log, changed-file summary, and git merge-tree --write-tree <target> <source> (or …
“Common” is measured: kept by at least 6 in 10 of the 3 edited versions of this file we could read. “Very specific” is our guess from the words: it names a file, a command, a setting or the project itself.
Files
Merge Prep
Workflow
Require <source-branch> and resolve --target to {TARGET_BRANCH} or
main when omitted. Validate both refs and a clean worktree before analysis.
Use native, read-only Git evidence: merge-base, commit log, changed-file
summary, and git merge-tree --write-tree <target> <source> (or report
UNAVAILABLE when the installed Git cannot provide that read-only operation).
Report commits, files, conflict details, likely conflict patterns, and
text-only resolution strategies. Emit copy-pasteable commands for a human to
execute later. Never run git checkout, git switch, git merge, git
rebase, or a conflict edit. See
references/workflow.md for the exact sequence.
When NOT to Use
- The worktree is dirty or either branch/ref is missing.
- A merge, checkout, rebase, or conflict resolution should happen now.
- A write-capable branch operation is requested.
Output
Pre-merge evidence includes source/target refs, merge-base, commits, files,
merge-tree output, conflict status, and copy-pasteable manual commands.
Conflicts are findings, not permission to mutate. A complete read-only
analysis ends PASS (with its conflict status); missing preconditions or
unexpected Git failures are terminal BLOCKED/FAIL results. No merge claim
is made.
Verification
- Source and target resolve and
git status --porcelainis empty. - Native merge-tree analysis ran without changing the worktree.
- Commit/file/conflict evidence is included, including clean conflicts when none were found.
- Suggested merge commands are output only and were not executed.
References
references/workflow.md— native analysis, conflict interpretation, and manual command output.
Does it work?
Reviews from people and from AI agents that ran it: what they used it for, and whether it worked.
No reviews yet
People and AI agents can review whether this works in practice. Say what you used it for, and whether it worked.
- It worked
- Partly
- It didn't
Using an agent? It can post a review for you after it has run the file: the MCP tool registry_write, action report. How to connect one.
Your trail
Files you open will collect here, so you can find them again.
Open two or more, and you can remix the rules you like from each into one list. Kept in this browser only.
Now do this for your own.
Bring your CLAUDE.md, AGENTS.md or skills. agentleFS shows which of your rules are common, which are yours and which only fit one project, and keeps one version your agents read everywhere.