lextures: Skill for Claude Code

.claude/skills/fix-merge-conflicts/SKILL.md

fix-merge-conflicts is a skill for Claude Code from StudyDrift/lextures. It costs 22 tokens per session (207 once invoked), scanned A, original, AGPL-3.0.

A development workflow for resolving Git merge conflicts without interactive prompts, then checking the resulting code with builds and tests.

In plain words
What is it for?
Use it when branches contain conflicting edits and you need to resolve them, run the relevant validation, and finalize the result.
Why use it?
It provides a repeatable way to finish conflict resolution and verify that the combined changes still work. This reduces the chance of leaving conflict markers or introducing build failures.

Skill for Claude Code

Written for Claude Code: disable-model-invocation in frontmatter.

This is StudyDrift/lextures's own configuration. It tells Claude Code how to work on lextures itself, so it is not a mod to install elsewhere. Copy it as a starting point and replace the rules that are about this project. Everything lextures configures →

Reuse

Borrowing it

Nothing to install: this file belongs to StudyDrift/lextures. Take a copy, put it at the same path in your own repository, and replace the rules that are about this project with yours.

Copy the file
curl -O https://raw.githubusercontent.com/StudyDrift/lextures/main/.claude/skills/fix-merge-conflicts/SKILL.md
Clone the repo
git clone --depth 1 https://github.com/StudyDrift/lextures

Made for: Claude Code.

Wrote this? Show the measurements

A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.

agentmods badge for fix-merge-conflicts

README.md
[![agentmods](https://agentmods.dev/badge/skills/studydrift/lextures/fix-merge-conflicts/github.svg)](https://agentmods.dev/skills/studydrift/lextures/fix-merge-conflicts)
Your own site
<a href="https://agentmods.dev/skills/studydrift/lextures/fix-merge-conflicts"><img src="https://agentmods.dev/badge/skills/studydrift/lextures/fix-merge-conflicts/github.svg" alt="Measured on agentmods" height="20"></a>

Or the 80×15 button, for a site that already has a row of RSS and ATOM ones. Only the verdict fits; the numbers stay here.

agentmods 80×15 button for fix-merge-conflicts

Your own site · 80×15
<a href="https://agentmods.dev/skills/studydrift/lextures/fix-merge-conflicts"><img src="https://agentmods.dev/badge/skills/studydrift/lextures/fix-merge-conflicts.svg" alt="Reviewed on agentmods" width="80" height="20"></a>
Per session 22 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 207 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. A grade says what 26 rules found in the file — not that it is safe.
Origin unknown No closer match found in the catalogue.
Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

ModelPer sessionOnce invoked
Fable 5.1 $0.00022 $0.00207
Opus 5.5 $0.00009 $0.00083
Sonnet 5.5 $0.00004 $0.00041
Haiku 4.5 $0.00002 $0.00021

Measured 2mo ago against content hash 2ca59b4d49dd, method: parsed. Prices are Anthropic first-party input rates as of 2026-10-07, from the pricing page.

Security

Grade A, and why

fix-merge-conflicts scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 2mo ago.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

.claude/skills/fix-merge-conflicts/SKILL.md · 34 lines

The source is not reproduced here

Licensed AGPL-3.0

The repository is licensed AGPL-3.0, which this catalogue does not treat as permission to reproduce the file. Read it at the source.

Read it on GitHub

Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

  1. 2mo ago First seen · 34 lines · 22 tokens per session scan A 2ca59b4d49dd

Subscribe to this mod's changes

fix-merge-conflicts is a skill published in the GitHub repository StudyDrift/lextures (62 stars, last pushed yesterday), licensed AGPL-3.0. It adds 22 tokens to every session and 207 once invoked, about $0.0001 per session on Opus 5.5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-30.

Related

Other skills, from other repositories

github-copilot-upgrader

Use this to update the Github Copilot CLI/SDK.

microsoft/vscode · 18 tokens

self-improve-with-tinyfish

Enables Hermes to create new reusable skills for itself by researching live web sources with TinyFish Search and Fetch, analyzing source coverage, writing SKILL.md files, and installing them into Hermes memory. Use when the user asks Hermes to learn, teach itself, upgrade itself, or save a reusable capability.

tinyfish-io/tinyfish-cookbook · 68 tokens

maintaining-python-tests

Maintains existing pytest and Django test suites without weakening correctness. Use when asked to reduce Python test runtime or CI work, investigate slow pytest families, remove stale migration tests, consolidate repeated setup, improve Python test ownership, or measure whether a test optimization worked after merge.…

PostHog/posthog · 110 tokens

vhs-e2e-gif

Record a test run, a TUI session, or any terminal command as a GIF with VHS and attach it to a GitHub PR as a release-hosted asset, never a repo commit. Use when asked to record an e2e run, demo a fix on a PR, attach a GIF or screen recording to a pull request, show a test passing visually, or produce a terminal…

dimetron/pi-go · 106 tokens

check-linters-before-commit

Before any commit, run linters, vet, tests, and build verification; do not commit until checks pass.

dimetron/pi-go · 30 tokens

agent-starters

Verify every starter supported by the stable production NVIDIA Elements CLI from a fresh consumer environment, investigate failures, and prepare at most one focused repair pull request. Use for nightly or scheduled production starter verification and starter availability failures.

NVIDIA/elements · 47 tokens