Home / ethanyoq / skill-hub · archives/user-installed-skills/resolving-merge-conflicts/1c694fde7b72c14d/resolving-merge-conflicts/SKILL.md · GitHub
resolving-merge-conflicts skillA
resolving-merge-conflicts is agent-read markdown (skill) from ethanyoq/skill-hub: Use when you need to resolve an in-progress git merge/rebase conflict..
Indexed from public GitHub and served as immutable, content-addressed versions. Install it pinned to an exact SHA-256 with the mdr CLI, and every file is verified against the hash recorded here before it reaches your agent. The deterministic audit below grades the latest version, and the same file always earns the same grade.
What the file says
1. **See the current state** of the merge/rebase. Check git history, and the conflicting files.
2. **Find the primary sources** for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.
3. **Resolve each hunk.** Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do **not** invent new behaviour. Always resolve; never `--abort`.
4. Discover the project's **automated checks** and run them — typically typecheck, then tests, then format. Fix anything the merge broke.
5. **Finish the merge/rebase.** Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.
Pin to a label to follow the author's releases, or to a sha256 to freeze the exact bytes forever. Either way the resolved hash is written to mdr.lock, and mdr install reproduces it on any machine.
GET https://markdownregistry.com/api/v1/artifacts/art_cslfeppjlnfedrv4
GET https://markdownregistry.com/api/v1/resolve?ref=ethanyoq/skill-hub/resolving-merge-conflicts
GET https://markdownregistry.com/api/v1/blob/c7c9ba81362a786aac05d2223123bf1bd2f8a99c3243a72882ede9c68bedfb24
Your agent 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.
ethanyoq/skill-hub · archives/user-installed-skills/aact-bulk-trials/e07736f27453c7b6/aact-bulk-trials/SKILL.md · 使用 AACT (Aggregate Analysis of ClinicalTrials.gov) PostgreSQL 数据仓库进行批量、历史、聚合性临床试验数据挖掘。Use this skill when the user…
ethanyoq/skill-hub · archives/user-installed-skills/adaptive-quality-gate/b5189ce6c1bdba9b/adaptive-quality-gate/SKILL.md · Use when work produces a deliverable, factual claim, dataset, code change, decision, publication, deployment…
ethanyoq/skill-hub · archives/user-installed-skills/add-changeset/eca9273317fbdf81/add-changeset/SKILL.md · Create a changeset file in .changeset/ that describes a user-facing change for the release notes
ethanyoq/skill-hub · archives/user-installed-skills/add-competitor/72939df8cfcf87bc/add-competitor/SKILL.md · Add a new competitor to the AI Visibility Tool Directory — researches the tool, generates data, takes a screenshot, and…
ethanyoq/skill-hub · archives/user-installed-skills/add-lang/00700e7d79525f4e/add-lang/SKILL.md · Add tree-sitter language support to codegraph end-to-end — wire the grammar + extractor, write tests, then benchmark…
ethanyoq/skill-hub · archives/user-installed-skills/aesthetic/a4c80565d9241341/aesthetic/SKILL.md · Create aesthetically beautiful interfaces following proven design principles. Use when building UI/UX, analyzing…
ethanyoq/skill-hub · archives/user-installed-skills/agent-eval/61ca5bbbd5c736b7/agent-eval/SKILL.md · Benchmark CodeGraph retrieval quality on a real codebase by comparing agent behavior with vs without CodeGraph. Use…
ethanyoq/skill-hub · archives/user-installed-skills/agent-reach/330e35da8cf10b5e/agent-reach/SKILL.md · MUST USE when user wants to 调研/research/搜索/search/查/找/look up anything on the internet — e.g. 全网调研 X / 帮我调研一下 X / 查一下 X…
ethanyoq/skill-hub · archives/user-installed-skills/agent-reach/81c9cf0fc08ce044/agent-reach/SKILL.md · MUST USE when user wants to 调研/research/搜索/search/查/找/look up anything on the internet — e.g. 全网调研 X / 帮我调研一下 X / 查一下 X…
romiluz13/cc10x · plugins/cc10x/skills/resolving-merge-conflicts/SKILL.md · Use when a git merge or rebase reports conflicts and the operation is in progress.
gtapps/claude-code-hermit · plugins/claude-code-dev-hermit/skills/resolving-merge-conflicts/SKILL.md · Use when you need to resolve an in-progress git merge/rebase conflict.
vodailocz/kilo-kit-mcp · skills/engineering/resolving-merge-conflicts/SKILL.md · Use when you need to resolve an in-progress git merge/rebase conflict.
j-star-films-studios/vibecode-protocol-suite · assets/.agent/skills/git-github-tools/resolving-merge-conflicts/SKILL.md · Use when you need to resolve an in-progress git merge/rebase conflict.
aethrox/doctrine · skills/resolving-merge-conflicts/SKILL.md · Discipline for resolving an in-progress git merge or rebase conflict, a conflict marker names two divergent intents…
mambo-wang/codewiki-plus · .codebuddy/skills/resolving-merge-conflicts/SKILL.md · Use when you need to resolve an in-progress git merge/rebase conflict.
