# Rebase

> Rebases current branch onto target with conflict resolution. Use when user wants to rebase, update branch base, or linearize history.

- Skill: `majiayu000/rebase-5` (Agent Skill, multi-file: 2 files)
- Install (CLI): `npx skillmds@latest add majiayu000/rebase-5`
- Raw SKILL.md: https://api.skillmd.com/api/skills/majiayu000/rebase-5/raw
- Safety review: pending (external: skill-scanner PASS, skillspector PASS)
- Works with: Claude Code, Claude.ai, OpenAI Codex
- Category: Coding & Dev Tools
- Author: majiayu000 (https://skillmd.com/u/majiayu000)
- Updated: 2026-09-22
- Page: https://skillmd.com/skills/majiayu000/rebase-5

---


# Rebase

Fetch and rebase current branch onto: $ARGUMENTS (default: origin/main).

## Task

Rebase the current branch onto the target branch. Resolve conflicts if any occur.

```bash
git fetch origin
git rebase $ARGUMENTS
# or default:
git rebase origin/main
```

If conflicts occur, analyze and resolve them, then continue the rebase.