# Rebase Main

> Rebase current branch onto origin/main and resolve conflicts

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

---


# Rebase Main

1. Run `git fetch origin main` to get latest main.
2. Run `git rebase origin/main` to rebase current branch.
3. If there are conflicts, resolve them by reading the conflicted files, making the correct edits, then `git add` and `git rebase --continue`. Repeat until rebase completes.