merge-release

Merge and Release

Automates the full release workflow: PR creation, merge, tagging, changelog update, and GitHub release.

Arguments

• $ARGUMENTS: Optional version bump type (patch|minor|major). Defaults to "patch".

Pre-flight Checks

Before starting, verify:

1. Working directory state: Check for uncommitted changes

   git status --porcelain
   

   • If changes exist and no recent commit in this conversation, STOP and ask user to commit first
   • If we just made a commit in this conversation, proceed

2. Branch state: Determine current branch and unpushed commits

   git branch --show-current
   git log origin/main..HEAD --oneline 2>/dev/null || git log origin/$(git branch --show-current)..HEAD --oneline
   

   • If no unpushed commits, STOP and inform user there's nothing to release

3. Get latest tags for version calculation

   git tag --sort=-v:refname | head -5
   

4. Verify tests pass (skip if user explicitly says to skip)

   make test
   

   • If tests fail, STOP and report failures

Execution Flow

Step 1: Create and Push PR

If on main with unpushed commits:

# Create feature branch from commit message
BRANCH_NAME=$(git log -1 --format=%s | sed 's/[^a-zA-Z0-9]/-/g' | tr '[:upper:]' '[:lower:]' | cut -c1-50)
git checkout -b "release/${BRANCH_NAME}"
git push -u origin "release/${BRANCH_NAME}"

Create PR:

# Get commit message for PR title
TITLE=$(git log -1 --format=%s)
gh pr create --title "$TITLE" --body "$(cat <<'EOF'
## Summary
Auto-generated release PR.

## Changes
See commit history for details.
EOF
)"

Step 2: Merge PR

# Get PR number from current branch
PR_NUMBER=$(gh pr view --json number -q .number)
gh pr merge $PR_NUMBER --squash --delete-branch

If merge fails, try rebase:

gh pr merge $PR_NUMBER --rebase --delete-branch

Step 3: Sync Local Main

git checkout main
git fetch origin
git reset --hard origin/main