# Rebase Main

> Safely update local main from origin/main, rebase the current work branch, resolve conflicts without losing local or generated work, and restore staged, unstaged, untracked, and ignored state.

- Skill: `hyochan/rebase-main-2` (Agent Skill)
- Install (CLI): `npx skillmds@latest add hyochan/rebase-main-2`
- Raw SKILL.md: https://api.skillmd.com/api/skills/hyochan/rebase-main-2/raw
- Safety review: pending
- Works with: Claude Code, Claude.ai, OpenAI Codex
- Category: Coding & Dev Tools
- Author: hyochan (https://skillmd.com/u/hyochan)
- Updated: 2026-09-17
- Page: https://skillmd.com/skills/hyochan/rebase-main-2

---


# Rebase Main (Claude Code)

Read `.codex/skills/rebase-main/SKILL.md` and follow its state capture, stash,
stale-lock, active-operation, fast-forward, conflict, restoration, and
no-implicit-push rules completely.