# Rebase Feat With Main

> Rebase the current pastiche feature branch onto main to absorb hotfixes. Use when the user invokes `/rebase-feat-with-main`, when resuming a task, or after a hotfix lands on main while a feature branch is in flight.

- **Type:** Skill
- **Install:** `agentstack add skill-retz8-pastiche-rebase-feat-with-main`
- **Verified:** Yes — security-reviewed for prompt injection and unsafe behavior
- **Seller:** [retz8](https://agentstack.voostack.com/s/retz8)
- **Installs:** 0
- **Category:** [Agent Skills](https://agentstack.voostack.com/c/agent-skills)
- **Latest version:** 0.1.0
- **License:** MIT
- **Upstream author:** [retz8](https://github.com/retz8)
- **Source:** https://github.com/retz8/pastiche/tree/main/.claude/skills/rebase-feat-with-main

## Install

```sh
agentstack add skill-retz8-pastiche-rebase-feat-with-main
```

Requires the [AgentStack CLI](https://agentstack.voostack.com/docs/cli). Works with Claude Code, Cursor, and any MCP-compatible agent.

## About

# rebase-feat-with-main

## Workflow

1. **Guard.** Current branch must be a feature branch (`/`) or sub-task branch — never main. Working tree must be clean; if not, stop and ask.
2. `git fetch origin main`
3. `git rebase origin/main`
4. **On conflict:** stop immediately, show the conflicting files, and let the user decide — never auto-resolve, never `--abort` without asking.
5. **If the branch is already pushed:** `git push --force-with-lease`. Never force-push main.
6. Report: how many commits were replayed and whether main had moved at all (no-op is a valid outcome).

## Source & license

This open-source skill is cataloged on AgentStack and links to its original source — we do not rehost the code.

- **Author:** [retz8](https://github.com/retz8)
- **Source:** [retz8/pastiche](https://github.com/retz8/pastiche)
- **License:** MIT

Install and usage instructions live in the source repository linked above.

## Pricing

- **Free** — Free

## Security capabilities

Automated source analysis of v0.1.0 — what this tool can access:

- **Network access:** no
- **Filesystem access:** no
- **Shell / process execution:** no
- **Environment & secrets:** no
- **Dynamic code execution:** no

*"Yes" means the capability is present in the source — more access means more to trust, not that it is unsafe.*


## Versions

- **0.1.0** — security scan: passed — Imported from the upstream source.

## Links

- Listing page: https://agentstack.voostack.com/l/skill-retz8-pastiche-rebase-feat-with-main
- Seller: https://agentstack.voostack.com/s/retz8
- Browse the marketplace: https://agentstack.voostack.com/browse

---
Listed on AgentStack — the marketplace for AI agent skills and MCP servers. Every listing is security-reviewed. Creators keep 70%.