원클릭으로 Manus에서 모든 스킬 실행

시작하기

pr-merge

스타6

포크4

업데이트2026년 2월 17일 16:33

Merge PR with rebase workflow as required by CLAUDE.md

설치

Codex 또는 Claude로 설치 이 Prompt를 복사해 Codex, Claude 또는 다른 어시스턴트에 붙여 넣으면 Skill 페이지를 검토하고 설치를 진행할 수 있습니다.

Manus에서 실행

출처

umans-ai

umans-ai/cinematch

GitHub 저장소 열기 Creator 저장소 보기

다운로드

Manus에서 실행

PR Merge Workflow

Merge feature branches following the rebase workflow from CLAUDE.md.

Usage

`/pr-merge [pr-number]`

Without PR number: uses current branch, infers PR from gh pr view. With PR number: uses specified PR.

Workflow

Verify clean state
- Must be on feature branch
- Working directory clean
Fetch latest
- git fetch origin
Rebase
- git rebase origin/main
- If conflicts: stop, instruct to resolve, then re-run
Re-run checks
- just check (or equivalent)
- Must pass before merge
Merge
- gh pr merge --rebase
- Verify merge succeeded
Cleanup (optional)
- git checkout main
- git pull origin main
- git branch -d <feature-branch>

Errors

On main branch → "Error: Must be on feature branch. Current: main"
Uncommitted changes → "Error: Uncommitted changes. Commit or stash first."
Rebase conflicts → "Conflicts detected. Resolve: 1) fix files, 2) git add ., 3) git rebase --continue, 4) re-run /pr-merge"
Checks fail → "Checks failed. Fix before merge."

Success

"✅ Merged with rebase. Cleanup done."

이 저장소의 다른 Skills

같은 저장소

onboard

umans-ai/cinematch

Onboard a new contributor to the CineMatch project - setup environment, verify tools, and explain the project

2026-03-126

just

umans-ai/cinematch

Intelligent just target wrapper with context-aware suggestions for CineMatch

2026-03-126

backlog

umans-ai/cinematch

Backlog workflow management - new, start, done commands for incremental delivery. Supports both admin (main branch) and contributor (feature branch) workflows.

2026-03-056

accept-contributor

umans-ai/cinematch

Accept a new contributor with write access and close their request issue

2026-02-206

tdd-check

umans-ai/cinematch

TDD cycle helper - run test, check result, update increment file

2026-02-176

check

umans-ai/cinematch

Force just check before commit, block if failures

2026-02-176

name	pr-merge
description	Merge PR with rebase workflow as required by CLAUDE.md

PR Merge Workflow

Merge feature branches following the rebase workflow from CLAUDE.md.

Usage

`/pr-merge [pr-number]`

Without PR number: uses current branch, infers PR from gh pr view. With PR number: uses specified PR.

Workflow

Verify clean state
- Must be on feature branch
- Working directory clean
Fetch latest
- git fetch origin
Rebase
- git rebase origin/main
- If conflicts: stop, instruct to resolve, then re-run
Re-run checks
- just check (or equivalent)
- Must pass before merge
Merge
- gh pr merge --rebase
- Verify merge succeeded
Cleanup (optional)
- git checkout main
- git pull origin main
- git branch -d <feature-branch>

Errors

On main branch → "Error: Must be on feature branch. Current: main"
Uncommitted changes → "Error: Uncommitted changes. Commit or stash first."
Rebase conflicts → "Conflicts detected. Resolve: 1) fix files, 2) git add ., 3) git rebase --continue, 4) re-run /pr-merge"
Checks fail → "Checks failed. Fix before merge."

Success

"✅ Merged with rebase. Cleanup done."