rebase

스타11

포크0

업데이트2026년 2월 10일 04:34

Pull latest main and rebase the current branch on top of it

설치

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

출처

adamfilli

adamfilli/happy-simulator

다운로드

Rebase on Main

Pull the latest main branch from origin and rebase the current branch on top of it.

Verify you are NOT on main. If on main, inform the user and stop.
Fetch the latest from origin: git fetch origin main
Rebase the current branch onto the updated main: git rebase origin/main
If the rebase succeeds, report the number of commits replayed and the current HEAD
If there are conflicts:
- List the conflicting files
- Show the conflict markers in each file
- Ask the user how they want to resolve each conflict
- Do NOT abort the rebase without user confirmation
After completion, run git log --oneline origin/main..HEAD to show the rebased commits