resolve-git-conflicts
/resolve-git-conflicts
Conflict resolution flow — understand the local git conflicts, present a resolution plan, and resolve them after the user approves it. Never continues the rebase. Use it when the repo has unresolved conflicts (rebase, merge, cherry-pick) or the user asks to resolve them.
Assessment and security
- Files in this package
- 1
- Scripts
- 0
- HTML comments
- 0
- URLs in SKILL.md
- 0
No signals detected. Repository changed on 27.10.2026, without references to retired models or APIs.
MPL-2.0, otwarta.
What it does and when to use it
Conflict resolution flow — understand the local git conflicts, present a resolution plan, and resolve them after the user approves it. Never continues the rebase. Use it when the repo has unresolved conflicts (rebase, merge, cherry-pick) or the user asks to resolve them.
Original author description
Conflict resolution flow — understand the local git conflicts, present a resolution plan, and resolve them after the user approves it. Never continues the rebase. Use it when the repo has unresolved conflicts (rebase, merge, cherry-pick) or the user asks to resolve them.
How it works
- When to use
- Phase 1 — Understand the problem (read-only)
- Phase 2 — Present the resolution plan
- Phase 3 — Execute
- Phase 4 — Stage and verify
- Phase 5 — Report
SKILL.md preview
--- name: resolve-git-conflicts description: Conflict resolution flow — understand the local git conflicts, present a resolution plan, and resolve them after the user approves it. Never continues the rebase. Use it when the repo has unresolved conflicts (rebase, merge, cherry-pick) or the user asks to resolve them. --- # Resolve Git Conflicts Resolve conflicts in the local repository. The user handles finishing the rebase themselves — you must **never** run `git rebase --continue`, `git rebase --skip`, `git merge --continue`, or anything similar. ## When to use - The repository has unresolved conflicts — during a rebase, merge, or cherry-pick — whether the user asks about them or not. - The user asks to resolve conflicts, in any phrasing: "fix the merge conflicts", "resolve these", "what's conflicting here?". ## Phase 1 — Understand the problem (read-only) 1. Run `git status` to detect the conflict state (rebase, merge, cherry-pick, etc.) and list conflicted files. 2. For each conflicted (unmerged) file, understand the situation **without modifying anything**: - Read the file and identify the conflict markers (`<<<<<<<`, `=======`, `>>>>>>>`). - Inspect both sides — `git show <ours>:<file>` and `git show <theirs>:<file>` — plus `git log`/`git show` on the commits involved to understand intent. - Identify what each side changed and why, and how they should be combined. ## Phase 2 — Present the resolution plan 3. **Present a clear plan to the user before touching any file.** For each conflicted file, state: - What each side changed and why. - Your proposed resolution and the reasoning behind it. - How the two sides are combined (both additive → merge; both modify the same code → keep the semantically correct version, merging intent from both sides when clear from code and context). 4. **Ask the user only when genuinely unclear.** Do not ask about anything you can determine yourself from the code, commit messages, or context. Only decisions that are not determinable and change the outcome (e.g. conflicting product decisions, which side to discard) warrant a question. **Collect all such questions together in an "Open Questions" section at the end of the plan**, so the user has full context to answer them properly. 5. **Wait for the user to accept the plan** (and answer any open questions) before editing, staging, or otherwise modifying anything. ## Phase 3 — Execute 6. Resolve each conflicted file by editing the file to the agreed merged content and removing all conflict markers. ## Phase 4 — Stage and verify 7. **Stage every resolved file** with `git add <file>`. Do not stage unrelated untracked files unless clearly part of the resolution. 8. Verify no conflict markers remain (search for `<<<<<<<` / `>>>>>>>` in resolved files) and that `git status` shows no unmerged paths. ## Phase 5 — Report 9. Briefly report the conflict state, how each conflicted file was resolved (and any answers received to open questions), and stop — do **not** run `git rebase --continue` or any other continuation command.
Versions
The database has no other skills named resolve-git-conflicts.
Identical content appears in 1 other GitHub folders. We show one copy with the highest score.
Database snapshot: 13.11.2026 · package version bc3d48a9c7d8 (SHA-256 digest of the entire package)
Downloads in the last 30 days: 0 · ranking
Report a problem with this skill: harmful content, incorrect descriptions or an author’s removal request.
Similar skills
- 96resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict. - 96resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict. - 100git-conflict-resolve
[Git] Use when resolving git merge, cherry-pick, rebase or stash-apply conflicts, with backup and analysis. - 100git-conflict-resolve
[Git] Use when resolving git merge, cherry-pick, rebase or stash-apply conflicts, with backup and analysis. - 91resolving-merge-conflicts
Use when you need to resolve an in-progress git merge/rebase conflict. - 100hk-merge-resolve
Resolve the conflicts of an in-progress merge, rebase or cherry-pick, then run the affected suite with the verify gate the entrypoint names. Triggers on: 'merge conflict', 'resolve conflicts', 'conflict markers', 'rebase conflict', or /hk-merge-resolve.