跳到正文
cccskills
免费在 GitHub 公开

fix-merge-conflicts

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

中文简介正在准备中。当前显示原文说明。

查看安装方法

包含的文件(1)

  • SKILL.md1019 B

SKILL.md(原文)

安装前可以查看交给 AI 代理的指令内容。

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

评价

还没有评价。欢迎分享你的使用感受。

评论

无需登录即可发表。欢迎分享使用感受、提问,或说明在哪些环境下无法运行。

还没有评论。来写第一条吧。

提交后会立即公开。请勿填写邮箱、电话等个人信息。URL 最多 2 个。

0 / 1000 字

此表单受 reCAPTCHA 保护,适用 Google 的隐私权政策和服务条款。

同一仓库的技能

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.

中文简介正在准备中。当前显示原文说明。

StudyDrift/lextures622026年10月14日 更新

fix-ci

免费

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

中文简介正在准备中。当前显示原文说明。

StudyDrift/lextures622026年10月14日 更新

Fetch and summarize review comments from the active pull request

中文简介正在准备中。当前显示原文说明。

StudyDrift/lextures622026年10月14日 更新

how

免费

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.

中文简介正在准备中。当前显示原文说明。

StudyDrift/lextures622026年10月14日 更新

implement

免费

Implements a new planned feature

中文简介正在准备中。当前显示原文说明。

StudyDrift/lextures622026年10月14日 更新

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.

中文简介正在准备中。当前显示原文说明。

StudyDrift/lextures622026年10月14日 更新

查看 StudyDrift 的全部技能

报告此技能的问题