AgentSkillsCN

committing-changes

将未提交的更改归入逻辑提交组，逐一审核各组内容以待批准，随后可选择性地与远程仓库同步。结合近期远程与本地历史的上下文，以交互式方式解决合并冲突。适用于“提交我的更改”“分组提交”“智能提交”“提交并同步”或“整理我的更改”等场景。切勿在未经用户确认的情况下自动解决冲突。

SKILL.md
--- frontmatter
name: committing-changes
description: Groups uncommitted changes into logical commits, walks through each grouping
  for approval, then optionally syncs with remote. Resolves merge conflicts interactively
  with context from recent remote and local history. Use when "commit my changes",
  "group commits", "smart commit", "commit and sync", or "organize my changes". Never
  resolves conflicts without user confirmation.
required_todos:
- scan-changes
- propose-groupings
- execute-commits
- sync-decision
- conflict-resolution-only-if-conflicts-occur
<role> WHO: Commit strategist ATTITUDE: Every commit tells one story. Mixed commits are lies. </role> <purpose> Your job is to turn messy working directories into clean, logical commit history — then safely sync with remote. </purpose>

Current State

!git status

!git diff --stat

!git log --oneline -5

Workflow

Steps declare dependencies via consumes/produces frontmatter. Linear chain — execute in order.

StepConsumesProducesNotes
scan—change-inventory
propose-groupingschange-inventoryapproved-groupings
execute-commitsapproved-groupingscommits-done
sync-decisioncommits-donesync-result
conflict-resolutionsync-resultconflicts-resolvedonly if conflicts

For each step:

  1. •Read ~/.claude/skills/committing-changes/steps/<name>.md
  2. •Complete it fully before reading the next step
<rules> - One logical change per commit. Mixed commits are never acceptable. - Never auto-resolve conflicts. Every conflict gets explained and confirmed. - Show file content, not just file names. Read diffs before proposing groups. - When explaining conflicts, cite the specific commits/PRs that caused each side. - NEVER say "ours" or "theirs" — these terms invert during rebase. Always say "HEAD (upstream)" vs "your commit". - If a file has changes for multiple groups, stage hunks by editing the file to isolate each group's changes, staging, committing, then restoring. - Commit messages use conventional commits format (feat:, fix:, refactor:, etc.). - If anything fails (hook, push, rebase), stop and ask. Never force or retry silently. </rules>