Resolve Git Conflicts
Skill Verified ActiveResolve 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.
Features
- 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
Use Cases
- 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
Non-Goals
- Performing automatic conflict resolution without user intervention
- Resolving binary file conflicts
- Managing Git repository configuration beyond conflict resolution steps
Installation
/plugin install agent-almanac@pjt222-agent-almanacQuality Score
VerifiedTrust Signals
Similar Extensions
Project Session Manager
100Worktree-first dev environment manager for issues, PRs, and features with optional tmux sessions
Sync Profiles
100Use when the user wants to list, create, switch, delete, compare, or inspect config sync profiles.
Using Git Worktrees
100Use when starting feature work that needs isolation from current workspace or before executing implementation plans - ensures an isolated workspace exists via native tools or git worktree fallback
Unslop Commit
100Rewrites commit messages so they sound like a careful human engineer wrote them. Strips AI/marketing slop ("comprehensive solution", "robust implementation", "leverage", "enhance", "seamlessly", "This commit..."). Keeps Conventional Commits format. Subject ≤72 chars (aim ≤50), imperative mood. Body only when "why" isn't obvious from the subject. Use when user says "humanize commit", "de-slop commit message", "make this commit sound human", "/unslop-commit", "/commit", "write a commit", or pastes a draft commit to clean up. Auto-triggers when staging changes.
Rule Effectiveness Analysis
100Analyze which rules are actively used vs inert. Detect coverage gaps. Recommend pruning to reduce token consumption.
Mcp Source
100Switch MCP for Unity package source in connected Unity projects. Use /mcp-source [main|beta|branch|local] to swap between upstream releases, your remote branch, or local dev checkout.