메뉴
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.
기본적으로 소스를 먼저 확인하는 Prompt가 선택됩니다. 직접 명령으로 전환하거나 로컬 사본을 다운로드할 수도 있습니다.
설치 여부를 결정하기 전에 SKILL.md와 SkillsMP에 표시된 보조 파일을 읽어 보세요.
Codex 또는 Claude로 설치 이 Prompt를 복사해 Codex, Claude 또는 다른 어시스턴트에 붙여 넣으면 Skill 페이지를 검토하고 설치를 진행할 수 있습니다.
직접 명령은 검토 Prompt를 거치지 않습니다. 실행하기 전에 소스를 확인하세요.
npx skills add https://github.com/weselben/RooForge --skill resolving-merge-conflicts명령은 한 줄로 유지됩니다. 복사하기 전에 가로로 스크롤해 전체 내용을 확인하세요.
로컬 사본을 원하시나요? SkillsMP에서 현재 제공할 수 있는 파일을 다운로드하세요.
SKILL.md 표시 중
| name | resolving-merge-conflicts |
| description | 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. |
| source | https://raw.githubusercontent.com/mattpocock/skills/main/skills/engineering/resolving-merge-conflicts/SKILL.md |
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.
subagent-driven-developmentWhen 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:
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.verification-before-completion before committing.This keeps parallel-implementation velocity even when conflicts land in the integration step.