Rebase On Main

Description

Rebase the current branch on `origin/main` and resolve any conflicts. ## Steps 1. **Check for uncommitted changes** — Ensure the working tree is clean: - Run `git status` to check for uncommitted changes - If there are uncommitted changes, warn the user and stop — do not stash or discard work 2. **Fetch and rebase** — Update the branch: - Run `git fetch origin main` - Run `git rebase origin/main` - If the rebase completes cleanly, skip to step 4 3. **Resolve conflicts** — For

Installation

Installs to ~/.claude/commands/utensils-claudette-rebase-on-main.md

Restart Claude Code, or start a new session, for it to be picked up.