# Rebase Main

> Safely update local main and rebase the current flutter_calendar_carousel branch without losing staged, unstaged, untracked, or ignored work.

- Skill: `hyochan/rebase-main-4` (Agent Skill)
- Install (CLI): `npx get-skill add hyochan/rebase-main-4`
- Raw SKILL.md: https://api.skillmd.com/api/skills/hyochan/rebase-main-4/raw
- Safety review: pending (external: skill-scanner PASS, skillspector PASS)
- Works with: Claude Code, Claude.ai, OpenAI Codex
- Category: Coding & Dev Tools
- Author: hyochan (https://skillmd.com/u/hyochan)
- Updated: 2026-09-22
- Page: https://skillmd.com/skills/hyochan/rebase-main-4

---


# Rebase Main (Claude Code)

Read and follow `.codex/skills/rebase-main/SKILL.md` completely, including its
working-tree snapshot, stash recovery point, ignored-file collision guards,
three-way conflict handling, restoration verification, and no-implicit-push
rule.

