Menu
Resolve git merge or rebase conflicts and continue the operation.
Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.
Based on SOC occupation classification
| name | git-conflicts |
| description | Resolve git merge or rebase conflicts and continue the operation. |
Use the code:cli skill.
Run git status to understand the merge or rebase state and identify conflicted files.
For each conflicted file:
After resolving all conflicts:
git add <resolved-files>
git rebase --continue
If more conflicts appear, repeat the process. Verify completion with git status and recent commit history.
Restore claude/codex agents from a tmux-reboot snapshot after tmux-resurrect reopens their windows.
Snapshot running tmux claude/codex agents immediately before a reboot so their sessions can be restored afterward.
Commit changes, run git-test precommit checks, and fix failures. Use when asked to fix build, test, lint, typecheck, or precommit failures.
Running precommit checks and build validation. ALWAYS use after ANY code changes.
This skill should be used after completing any task, before returning control to the user. Always run this skill — it handles the case where there's nothing to do.
Coordination guidelines for leading a team of task-executing agents