메뉴
Fetch a remote and merge its branch into the current branch, resolving conflicts without breaking code. Use when asked to merge a remote branch like `upstream/main`.
Codex 또는 Claude로 설치 이 Prompt를 복사해 Codex, Claude 또는 다른 어시스턴트에 붙여 넣으면 Skill 페이지를 검토하고 설치를 진행할 수 있습니다.
SOC 직업 분류 기준
Investigate a developer-reported bug from a bug description, identify and rank likely root causes with evidence quality, write BUG_INVESTIGATION.md with ranked problems, detailed solutions, and Implemented?/Worked? status columns, then iteratively apply one selected fix at a time until the user confirms one worked or every proposed fix has failed. Use when invoked as /bugkiller or when asked to investigate and fix a bug through a ranked hypothesis document.
Open a pull request following the full PR workflow: resolve the base branch, check size limits (split into independent SRP-based branches if over the MAX limit), handle uncommitted changes, build the PR description from the template, run the pre-submit checklist, and open the PR with gh pr create. Use when asked to open a PR, create a pull request, or submit work for review.
Read review comments on a GitHub Pull Request, filter actionable feedback, analyze each comment, propose a solution, and walk the user through an interactive resolution flow. Use when asked to fix, address, or resolve PR review comments.
Analyze the current git diff, draft a pull request title and description, and generate a pull_request.md file for manual copy-paste. Stops before opening the PR on GitHub. Use when you want to fill in the PR description yourself without creating the PR.
Refactor tests using Behavior Driven Development principles and improve them to be readable, meaningful, and real-world focused, avoiding unnecessary mocks. Requires an explicit `BASE_REF` to diff against. Use when asked to write, rewrite, or improve tests focusing on real user journeys and scenarios.
Analyze the current branch diff against an explicit `BASE_REF` and generate a `SMOKE_TEST.md` file with branch-specific manual testing steps. Include prerequisite data setup using `rails c` when the change depends on database state, or API requests when the repo is frontend-only but still needs seeded backend data. Use when asked for a smoke test guide, manual QA checklist, or step-by-step branch testing instructions for a feature or bugfix.
| name | merger |
| description | Fetch a remote and merge its branch into the current branch, resolving conflicts without breaking code. Use when asked to merge a remote branch like `upstream/main`. |
Purpose: Merge
<remote>/<branch>into the current branch and resolve conflicts safely.
| Parameter | Required | Description |
|---|---|---|
MERGE_REF | Yes | The ref to merge, e.g. upstream/main. Required. |
If missing, stop and ask.
git fetch <remote> (the part before / in MERGE_REF)git merge <MERGE_REF><<<<<<< / ======= / >>>>>>> markers, then git add and git commit --no-edit.--ours, --theirs, --no-verify, reset --hard, or push.