awesome-claude-code-toolkit/plugins/update-branch/commands/rebase.md at main - awesome-claude-code-toolkit - WEVAL Git

yanis/awesome-claude-code-toolkit

Files

Rohit Ghumare c3f43d8b61 Expand toolkit to 135 agents, 120 plugins, 796 total files

- Add 60 new agents across all 10 categories (75 -> 135)
- Add 95 new plugins with command files (25 -> 120)
- Update all agents to use model: opus
- Update README with complete plugin/agent tables
- Update marketplace.json with all 120 plugins

2026-02-04 21:08:28 +00:00

641 B

Raw Permalink Blame History

Rebase the current feature branch onto the latest upstream branch and resolve conflicts.

Steps

Verify the current branch and its upstream:
Fetch the latest changes from remote:
Check for potential conflicts before rebasing:
Start the rebase:
If conflicts occur:
After successful rebase:
Report the rebase result.

Format

Branch: <branch name>
Base: <upstream branch>
Commits Rebased: <count>
Conflicts: <count resolved>

Rules

Always use --force-with-lease instead of --force for safety.
Never rebase shared branches that others are working on.
Run the full test suite after rebasing.