Skip to content
cccskills
FreePublished on GitHub

fix-merge-conflicts

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

The English summary is being prepared. Showing the original description.

See how to install

Files included (1)

  • SKILL.md1019 B

SKILL.md (original)

Review the instructions the agent will receive before you install.

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

Reviews

No reviews yet. Tell others what you thought.

Comments

No login needed. Share how it worked for you, ask a question, or note where it did not run.

No comments yet. Be the first to write one.

Comments are published right away. Do not include personal information such as email addresses or phone numbers. Up to 2 URLs.

0 / 1,000 characters

This form is protected by reCAPTCHA, and the Google Privacy Policy and Terms of Service apply.

More skills from this repository

Skeptical analysis and critique of claims, plans, and code without taking anyone at face value. Use when the user says "don't trust me", wants adversarial review, red-teaming, assumption checking, or verification that generated or proposed code is actually correct. Triggers on skepticism, critique everything, verify claims, challenge assumptions, red team, devil's advocate, prove it, smell test.

The English summary is being prepared. Showing the original description.

StudyDrift/lextures62Updated Oct 14, 2026

fix-ci

Free

Find failing PR checks, inspect logs or external check links, and apply focused fixes

The English summary is being prepared. Showing the original description.

StudyDrift/lextures62Updated Oct 14, 2026

Fetch and summarize review comments from the active pull request

The English summary is being prepared. Showing the original description.

StudyDrift/lextures62Updated Oct 14, 2026

how

Free

Use for "how does X work", code walkthroughs before changing something, and placement / ownership / layering questions ("where should this live", "which package owns this", "is this the right layer"). Explains subsystem architecture, runtime flow, onboarding mental models. Can critique architecture. Use why for motivation.

The English summary is being prepared. Showing the original description.

StudyDrift/lextures62Updated Oct 14, 2026

Implements a new planned feature

The English summary is being prepared. Showing the original description.

StudyDrift/lextures62Updated Oct 14, 2026

Design engineering principles for making interfaces feel polished. Use when building UI components, reviewing frontend code, implementing animations, hover states, shadows, borders, typography, micro-interactions, enter/exit animations, or any visual detail work. Triggers on UI polish, design details, "make it feel better", "feels off", stagger animations, border radius, optical alignment, font smoothing, tabular numbers, image outlines, box shadows.

The English summary is being prepared. Showing the original description.

StudyDrift/lextures62Updated Oct 14, 2026

See all skills by StudyDrift

Report a problem with this skill