git-merge SKILL.md skillA
git-merge from mithunwijayasiri/dotclaude is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.
mdr add mithunwijayasiri/dotclaude/git-merge@git:20261011.04bbb86Pins git:20261011.04bbb86 in mdr.lock. Pin the fingerprint instead.
- Audit grade
- A, 17 of 17 checks passed
- Kind
- SKILL.md skill
- Repository
- mithunwijayasiri/dotclaude
- Path
skills/git-merge/SKILL.md- Versions recorded
- 5
- Latest version
- git:20261011.04bbb86, committed Oct 11, 2026
- First version recorded
- Aug 27, 2026
- Size
- 10,272 bytes
- Repository stars
- 4
- License
- MIT
Merge one branch (usually the default branch) into the current branch while preserving local unstaged changes, resolving conflicts by understanding both sides, and catching silent semantic conflicts with the repo's own checks. Trigger on explicit `/git-merge`, or when the user asks to merge a branch or the default branch into their current branch — especially when they want to keep local-only unstaged changes.
Collected from public GitHub. Every version is saved exactly as it was and never changes. Install it at an exact version with the mdr tool, and every file is checked before it reaches your agent. The main file is checked against the SHA-256 fingerprint recorded here, and the others against the fingerprints GitHub keeps for its source commit. The automatic checks below grade the latest version, and the same checks always give the same file the same grade.
What the file says
# Git Merge — Safe Branch Integration Workflow the main agent runs. Investigate before mutating; preserve local-only unstaged changes; resolve conflicts by diagnosis; verify with the repo's own checks before done. Scripts in this skill's `scripts/` folder (bash, run with cwd = repo root, as `bash <skill-dir>/scripts/<name>.sh`) do the mechanical steps and print compact digests. Below, `scripts/` means that folder. ## Hard rules - Read-only investigation first. `merge-recon.sh` (fetch + map state) before any `stash`/`merge`. - Never auto-commit beyond the one merge the user authorized. `git commit`/`--amend` need explicit user approval — ask (amend / separate fixup / leave it). - `git add`/`stash`/`merge` are mutating — explain, then run (user already asked to merge = authorization for the merge itself). - Keep the user's local-only unstaged files OUT of any commit. Stage only merge-resolution files. - Never push unless asked. - Never install tooling mid-merge. Run only checks the repo already has. ## 1. Recon ```bash bash scripts/merge-recon.sh <target> # default target: origin's default branch; current branch from HEAD ``` …
Read the whole file at its exact version.
How to install
mdr add mithunwijayasiri/dotclaude/git-merge@sha256:b6c63666de213bceThe line at the top of this page pins the label git:20261011.04bbb86, which is what most people want. This one pins the sha256 fingerprint of the contents instead, so it survives a label being moved. Either way the exact version is written to mdr.lock, and mdr install downloads and checks those contents again, so it installs them exactly or stops with an error.
[](https://markdownregistry.com/a/art_3uz3dhxfyikbp2ns)
2 badge image fetches in 30 days. What the badge shows.
Versions
The registry has recorded 5 versions of this file, between Aug 27, 2026 and Oct 11, 2026, about one every 11 days.
| version | committed | commit | size | audit | |
|---|---|---|---|---|---|
| git:20261011.04bbb86 latest | 2026-10-11 | 04bbb86 | 10,272 B | A | view · diff |
| git:20261010.1ebf38d | 2026-10-10 | 1ebf38d | 10,120 B | A | view · diff |
| git:20261009.aa46ea6 | 2026-10-09 | aa46ea6 | 10,076 B | A | view · diff |
| git:20260827.1950e0d | 2026-08-27 | 1950e0d | 12,114 B | A | view · diff |
| git:20260827.c080294 | 2026-08-27 | c080294 | 11,501 B | A | view |
Audit of the latest version
- pass: Frontmatter block present
- pass: Frontmatter declares a name
- pass: Frontmatter declares a description
- pass: Size between 200 bytes and 200 KB (10272 bytes)
- pass: No zero-width or bidi control characters
- pass: No instruction hidden inside an HTML comment
- pass: No link to an exfiltration or paste host
- pass: No credential-shaped string
- pass: No instruction to send local credentials anywhere
- pass: No text hidden with inline styles
- pass: No prompt-injection phrasing
- pass: No curl or wget piped into a shell
- pass: No recursive delete of root, home or parent
- pass: No instruction to read or print local credentials
- pass: No base64 blob over 200 characters
- pass: No link to a raw IP address
- pass: No script tag
Source
mithunwijayasiri/dotclaude · 4 stars · license MIT · pushed 2026-11-03 · branch main
API
GET https://markdownregistry.com/api/v1/artifacts/art_3uz3dhxfyikbp2ns GET https://markdownregistry.com/api/v1/resolve?ref=mithunwijayasiri/dotclaude/git-merge GET https://markdownregistry.com/api/v1/blob/b6c63666de213bce949c6f8db6d7c0e34b85f4c7e08e478268d5e2bc89cbb73d
Your AI assistant does the legwork. You hear about the deals worth your word. Hand yours the standing instructions at modelranch.com and it joins the network that reads files like this one.
Guides: the SKILL.md format and its required fields · what to check before you install a skill · how to pin a skill to an exact version · where to find agent skills · keeping a team on the same skills · which agent file does what.
More from mithunwijayasiri/dotclaude
Every file in mithunwijayasiri/dotclaude