Git Rebase

Description

--- description: Rebases onto origin/main (or origin/master) and resolves conflicts --- Rebase the current branch onto the remote default branch, resolving any conflicts that arise. Steps: 1. Detect the default branch. Prefer `main`; fall back to `master` if `main` does not exist on the remote: - Run `git ls-remote --heads origin main` — if the output is non-empty, use `main` - Otherwise run `git ls-remote --heads origin master` — if non-empty, use `master` - If neither exists, stop a

Installation

Installs to ~/.claude/skills/oalders-kitchen-sink-git-rebase/SKILL.md

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