fix-merge-conflicts SKILL.md skillA

This file is byte-identical to the first copy the registry indexed, one of 6 indexed copies. Same content hash, so the same checks give both the same grade.

fix-merge-conflicts from tefuirnever/azhou-ai-hub is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.

mdr add tefuirnever/azhou-ai-hub/fix-merge-conflicts@git:20261106.dbf35b5

Pins git:20261106.dbf35b5 in mdr.lock. Pin the fingerprint instead.

Audit grade

A, 17 of 17 checks passed

Kind

SKILL.md skill

Repository

tefuirnever/azhou-ai-hub

Path

packages/pstack-agent-harness/components/cursor-team-kit/skills/fix-merge-conflicts/SKILL.md

Versions recorded

1

Latest version

git:20261106.dbf35b5, committed Nov 6, 2026

Size

988 bytes

Repository stars

3

License

MIT

Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution.

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

# Fix merge conflicts

## Trigger

Branch has unresolved merge conflicts and needs a reliable path to a buildable state.

## Workflow

1. Detect all conflicting files from git status and conflict markers.
2. Resolve each conflict with minimal, correctness-first edits.
3. Prefer preserving both sides when safe. Otherwise, choose the variant that compiles and keeps public behavior stable.
4. Regenerate lockfiles with package manager tools instead of hand-editing.
5. Run compile, lint, and relevant tests.
6. Stage resolved files and summarize key decisions.

## Guardrails

- Keep changes minimal and readable.
- Do not leave conflict markers in any file.
- Avoid broad refactors while resolving conflicts.
- Do not push or tag during conflict resolution.

## Output

- Files resolved
- Notable resolution choices
- Build/test outcome

Read the whole file at its exact version.

How to install

mdr add tefuirnever/azhou-ai-hub/fix-merge-conflicts@sha256:738b251281b30fd3

[![mdr](https://markdownregistry.com/badge/art_ijapqbmnafcurrij.svg)](https://markdownregistry.com/a/art_ijapqbmnafcurrij)

Versions

The registry has recorded 1 version of this file, committed on Nov 6, 2026.

Audit of the latest version

Source

API

GET https://markdownregistry.com/api/v1/artifacts/art_ijapqbmnafcurrij
GET https://markdownregistry.com/api/v1/resolve?ref=tefuirnever/azhou-ai-hub/fix-merge-conflicts
GET https://markdownregistry.com/api/v1/blob/738b251281b30fd33e3892d0679cf94249e9c9e29e1bed40bcdde4a6aca98a76

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 tefuirnever/azhou-ai-hub

Every file in tefuirnever/azhou-ai-hub

Other files named fix-merge-conflicts

Browse by kind, by grade A, or by owner.