Resolve Git Conflicts
技能 已验证 活跃Resolve merge and rebase conflicts with safe recovery strategies. Covers identifying conflict sources, reading conflict markers, choosing resolution strategies, and continuing or aborting operations safely. Use when a git merge, rebase, cherry-pick, or stash pop reports conflicts, when a git pull results in conflicting changes, or when you need to safely abort and restart a failed merge or rebase operation.
To help developers safely and effectively resolve Git merge and rebase conflicts, preventing data loss and workflow interruption.
功能
- Identify merge/rebase conflict sources
- Read and interpret Git conflict markers
- Choose and apply resolution strategies (ours, theirs, manual)
- Safely continue or abort Git operations
- Verify conflict resolution and repository state
使用场景
- When a git merge reports conflicts
- When a git rebase reports conflicts
- When a git pull results in conflicting changes
- When needing to safely abort a failed git operation
非目标
- Performing automatic conflict resolution without user intervention
- Resolving binary file conflicts
- Managing Git repository configuration beyond conflict resolution steps
安装
/plugin install agent-almanac@pjt222-agent-almanac质量评分
已验证类似扩展
Project Session Manager
100Worktree-first dev environment manager for issues, PRs, and features with optional tmux sessions
Sync Profiles
100用于在用户想要列出、创建、切换、删除、比较或检查配置同步配置文件时使用。
Using Git Worktrees
100在开始需要与当前工作区隔离的功能性工作，或在执行实现计划之前使用 - 通过原生工具或 git worktree 回退确保存在隔离的工作区。
Unslop Commit
100重写提交消息，使其听起来像一个严谨的程序员编写的。去除 AI/营销术语（“全面的解决方案”、“健壮的实现”、“利用”、“增强”、“无缝地”、“此提交...”）。保留 Conventional Commits 格式。主题 ≤72 个字符（目标 ≤50），祈使语气。仅当“为什么”在主题中不明显时才写正文。在用户说“人性化提交”、“去营销术语化提交消息”、“让这个提交听起来像人话”、“/unslop-commit”、“/commit”、“写一个提交”或粘贴草稿提交以供清理时使用。暂存更改时自动触发。
Rule Effectiveness Analysis
100Analyze which rules are actively used vs inert. Detect coverage gaps. Recommend pruning to reduce token consumption.
Mcp Source
100切换已连接 Unity 项目中的 MCP for Unity 包源。使用 /mcp-source [main|beta|branch|local] 在上游发行版、远程分支或本地开发检出之间进行切换。