メニュー
Resolving rebase conflicts with design intent preservation. Use when rebasing, resolving merge conflicts or choosing a conflict resolution strategy.
Codex または Claude でインストール この Prompt をコピーして Codex、Claude、または他のアシスタントに貼り付けると、Skill ページを確認してインストールできます。
SOC 職業分類に基づく
Drive a real browser with the browser_go, browser_see, browser_do and browser_check tools: navigate, read the page as an accessibility outline, query the DOM across frames and shadow roots, inspect one element's box and cascade, run expressions, press keys and gestures, wait for conditions, read console and network telemetry, emulate devices, shape the network, take screenshots, and form verdicts about accessibility, layout, design drift, visual diffs and performance. Use when asked to "open a page", "look at this site", "click the button", "what does the page say", "why is this element red", "check the console", "what requests did it make", "test it on mobile", "is this accessible", "did the layout break", "what changed visually", or any request that involves looking at or operating a web page.
How to audit a web page for accessibility with browser_check and browser_see: the keyboard walk, the axe and structural rule sets, reading order, live region announcements, contrast and target size. Covers what the tools decide, what they deliberately refuse to decide, and how to report findings without overstating them. Use when asked "is this accessible", "check accessibility", "run an a11y audit", "will a screen reader work", "can you use this with a keyboard", "check the contrast", "is this WCAG compliant", or when reviewing a change that touches markup, focus, colour or interaction.
Output contract for round-1 council reviewer subagents in pr-workflow. The JSON shape of findings, location kinds, thread-relation fields, and the verify_output self-check protocol. Loaded into each reviewer subagent via --skill.
Output contract for round-3 critique reviewer subagents in pr-workflow. The JSON shape of critique entries, position vocabulary, rationale requirements, and the verify_output self-check protocol. Loaded into each critique reviewer subagent via --skill.
Output contract for round-2 judge subagents in pr-workflow. The JSON shape of consolidated findings, attribution fields, the optional self-signal, and the verify_output self-check protocol. Loaded into each judge subagent via --skill.
Output contract for stack-wide judge subagents in pr-workflow. The JSON shape with per-PR and cross-PR findings, attribution fields, optional self-signal, membership rules, and the verify_output self-check protocol. Loaded into each stack-judge subagent via --skill.
| name | git-rebase-convention |
| description | Resolving rebase conflicts with design intent preservation. Use when rebasing, resolving merge conflicts or choosing a conflict resolution strategy. |
Think of rebasing as archaeology meets architecture: you need to understand why each change was made, then design a result that incorporates both visions.
For every conflict, ask:
Same problem, different solutions: both sides fixed the same thing differently. Combine the best aspects of each.
Parallel features: both sides added different capabilities to the same area. Find a way to accommodate both.
Architectural divergence: one side refactored while the other added features. Adapt the features to fit the new structure.
Performance vs capability: one side optimized, the other extended. Preserve the features within the performance improvements.
After each conflict resolution:
Run the full suite after the rebase completes. Never push until everything passes.
Git commands that open an editor or prompt for input will block the terminal indefinitely. Guard against this on every rebase invocation:
git rebase -i or --interactive. If commits
need reordering, squashing or editing, do it with
separate non-interactive commands (git reset,
git commit --amend, etc.).GIT_TERMINAL_PROMPT=0 so git fails instead
of blocking on credential or confirmation prompts:
GIT_TERMINAL_PROMPT=0 git rebase main
--force-with-lease, never --force.