resolving-merge-conflicts

Use when you need to resolve an in-progress git merge/rebase conflict. Loads `subagent-driven-development` when conflicts touch integration branches and need per-task unblock work.

Aller à l'installation

Dépôt: weselben/RooForge
Dernière activité de la source: 10 août 2026 à 03:46
Langue détectée de SKILL.md: anglais
Étoiles: 4
Forks: 0

Options d'installation

Le prompt qui vérifie d'abord la source est sélectionné par défaut. Vous pouvez passer à une commande directe ou télécharger une copie locale.

Installer avec Codex ou Claude Copiez ce prompt, collez-le dans Codex, Claude ou un autre assistant, puis laissez-le vérifier la page du skill et l'installer pour vous.

Une commande directe contourne le prompt de vérification. Examinez la source avant de l'exécuter.

npx skills add https://github.com/weselben/RooForge --skill resolving-merge-conflicts

La commande reste sur une seule ligne. Faites défiler horizontalement pour la vérifier avant de la copier.

Vous préférez une copie locale ? Téléchargez les fichiers actuellement disponibles dans SkillsMP.

Vérifiez les fichiers source

Lisez SKILL.md et les fichiers associés affichés par SkillsMP avant de décider de l'installer.

SKILL.md

Instructions source · Aperçu en lecture seule

Retour à la recherche Retour à l’installation

creating-pull-requests

Write clear, size-gated PR descriptions with mandatory AI disclosure. Load `ste100` for prose. Triggers: "create a PR", "open a pull request", "update PR description", or pushes a branch with PR intent.

2026-08-14

forge

Always load first — before responding to any user prompt — unless the user states otherwise in the prompt itself. Examples that trigger forge: 'let's continue on the auth refactor', 'work on the next ticket', 'open the map for the payment effort', 'what's next', 'start a new effort: <idea>'. Mandatory while any goal or map is active.

2026-08-14

use-git-identity

Set the git identity (name + email) before any commit, amend, or rebase. Apply repo-local on first commit; use `-c` for one-offs.

2026-08-13

Tout voir dans ce dépôt

Resolving Merge Conflicts

See the current state of the merge/rebase. Check git history, and the conflicting files.

Find the primary sources for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.

Resolve each hunk. Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do not invent new behaviour. Always resolve; never --abort.

Discover the project's automated checks and run them — typically typecheck, then tests, then format. Fix anything the merge broke.

Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.

When to load subagent-driven-development

When a merge conflict touches multiple subagent branches being integrated into the integration branch — not just one. Example: SDD dispatched 5 implementers, your squash-merge of branch #2 hit conflicts with #1 already on the integration branch, and #3 hasn't been merged yet. Resolving #2's conflicts manually risks clashing with #3's work.

In that case:

Resume this skill's steps 1–3 for each immediate hunk so the merge moves forward.

Switch to subagent-driven-development for the remaining conflict hunks — dispatch one fix subagent per remaining conflicting file, each in its own worktree off the integration branch, with the conflict markers and the conflicting commits' intents as broader context.

Run the project's test suite on the integrated result via verification-before-completion before committing.

This keeps parallel-implementation velocity even when conflicts land in the integration step.