rebase-main
Rebase current branch onto origin/main and resolve conflicts
Source facts
- Repository
- okou-ai/team-skills
- Last source activity
- April 2, 2026 at 05:28
- Detected SKILL.md language
- English
- Stars
- 1
- Forks
- 2
Install options
The review-first prompt is selected by default. You can switch to a direct command or download a local copy.
Review the source files
Read SKILL.md and any companion files shown by SkillsMP before deciding whether to install.
Showing SKILL.md
SKILL.md
Source instructions · Read-only preview- name
- rebase-main
- description
- Rebase current branch onto origin/main and resolve conflicts
- user-invocable
- true
# 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.
View on GitHub