fix-merge-conflicts SKILL.md skillA
This file is byte-identical to the first copy the registry indexed, one of 4 indexed copies. Same content hash, so the same checks give both the same grade.
fix-merge-conflicts from arjitj2/open-pstack is an agent skill: a SKILL.md folder an AI agent loads when a task calls for it.
mdr add arjitj2/open-pstack/fix-merge-conflicts@git:20260604.d869e0aPins git:20260604.d869e0a in mdr.lock. Pin the fingerprint instead.
- Audit grade
- A, 17 of 17 checks passed
- Kind
- SKILL.md skill
- Repository
- arjitj2/open-pstack
- Path
plugins/pstack/skills/fix-merge-conflicts/SKILL.md- Versions recorded
- 1
- Latest version
- git:20260604.d869e0a, committed Jun 4, 2026
- Size
- 988 bytes
- Repository stars
- 14
- 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 arjitj2/open-pstack/fix-merge-conflicts@sha256:738b251281b30fd3The line at the top of this page pins the label git:20260604.d869e0a, 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_lnq6ybjraw6h6w6z)
3 badge image fetches in 30 days. What the badge shows.
Versions
The registry has recorded 1 version of this file, committed on Jun 4, 2026.
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 (988 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
arjitj2/open-pstack · 14 stars · license MIT · pushed 2026-10-19 · branch main
API
GET https://markdownregistry.com/api/v1/artifacts/art_lnq6ybjraw6h6w6z GET https://markdownregistry.com/api/v1/resolve?ref=arjitj2/open-pstack/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 arjitj2/open-pstack
Every file in arjitj2/open-pstack