rebase
Rebase the current branch onto main.
Works with
--- name: rebase description: Rebase the current branch onto main. license: Apache-2.0 --- Rebase the current branch onto main. ## Process 1. Run `git rebase main`. 2. If there are conflicts, resolve them and continue the rebase. 3. Verify the result with `git log --oneline -5`. 4. **MANDATORY**: Run `make test` after the rebase completes successfully. The rebase may have introduced incompatibilities between main's changes and the branch's changes. Tests MUST pass before the branch is considered ready. Do NOT skip this step — we cannot break main.
More Git Workflows skills
git-commit
github/awesome-copilot
Execute git commit with conventional commit message analysis, intelligent staging, and message generation. Use when user asks to commit changes, create a git commit, or mentions "/commit". Supports: (1) Auto-detecting type and scope from changes, (2) Generating conventional commit messages from diff, (3) Interactive commit with optional type/scope/description overrides, (4) Intelligent file staging for logical grouping
git-workflow-and-versioning
addyosmani/agent-skills
Structures git workflow practices. Use when making any code change. Use when committing, branching, resolving conflicts, or when you need to organize work across multiple parallel streams. Use when cutting a release, choosing a semantic version bump, tagging, or writing a changelog.
resolve-merge-conflicts
warpdotdev/common-skills
Resolve Git merge conflicts by extracting only unresolved paths, conflict hunks, and compact diffs instead of loading whole files into context. Use when a merge, rebase, cherry-pick, or stash pop stops on conflicts, when `git status` shows unmerged paths, or when files contain conflict markers.
