create-pr

Create Pull Request

Rebase from the latest origin/main, squash commits, and create a PR on GitHub with an intelligent title and description.

Usage

Invoke with /create-pr or when the task matches.

Arguments:

• --draft: Create as draft PR
• --base <branch>: Target branch (default: main)

Workflow

Step 1: Verify Prerequisites

# Check current branch
git branch --show-current

# Check if on main/master (should NOT be)
if [[ $(git branch --show-current) == "main" || $(git branch --show-current) == "master" ]]; then
  echo "ERROR: Cannot create PR from main/master branch"
  exit 1
fi

# Check for uncommitted changes
git status --short

# Ensure gh CLI is available
gh --version

Action: If there are uncommitted changes, stop, and then ask user to commit or stash them first.

Step 2: Check for Existing PR

# Check if PR already exists for current branch
gh pr view --json number,title,url 2>/dev/null || echo "No existing PR"

Handle Existing PR:

• If PR exists, inform user and ask permission to force-update it
• Warn that this will rewrite the commit history and PR description
• If user declines, abort the process

Step 3: Fetch and Rebase

# Fetch latest from origin
git fetch origin main

# Check divergence
git log --oneline HEAD ^origin/main

# Non-interactive rebase onto origin/main
git rebase origin/main

Handle Conflicts: If rebase fails due to conflicts, abort and let user handle rebase manually:

# On rebase failure, abort automatically
git rebase --abort

# Inform user to resolve conflicts manually
echo "Rebase failed due to conflicts. Please resolve manually and retry /create-pr"
exit 1

Step 4: Squash Commits into Single Commit

After successful rebase, squash all commits since origin/main into a single commit:

# Count commits to squash
git rev-list --count origin/main..HEAD

# Soft reset to origin/main (keeps changes staged)
git reset --soft origin/main

# Generate commit message using gen-commit-msg logic