update-branch — Claude Code plugin: rebase branches, install
update-branch — a Claude Code plugin that rebases feature branches onto the main branch and resolves merge conflicts. Runs when syncing long-lived branches before a merge.
Apache-2.0 ★ 2,858 updated 2026-05-12
/plugin marketplace add rohitg00/awesome-claude-code-toolkit
/plugin install update-branch@claude-code-toolkitWhat update-branch does
The plugin runs git rebase on a feature branch, pulling in changes from the main branch (typically main or develop). When rebase hits conflicts, the plugin helps resolve them by showing changed files and suggesting merge strategies. Without it, the team rebases manually via CLI.
Useful in projects where feature branches live longer than one sprint and the main branch moves ahead. The plugin cuts down routine work: no need to switch to the terminal and handle conflicts separately.
Installed with two commands — first add the repository to Claude Code, then install the plugin itself. Works only in repositories with Git.
What it helps with
- update a feature branch before merging into
main - rebase onto the current
developbranch - resolve conflicts after rebase
- sync a long-lived branch with the main branch
- check branch state before a pull request
Example prompts for the agent
- Rebase the current branch onto
mainand show conflicts - Update feature branch
feature/user-authwithdevelop - Run
/update-branch:rebasefor branchbugfix/api-timeout
How to install update-branch
Plugin marketplace
/plugin marketplace add rohitg00/awesome-claude-code-toolkit/plugin install update-branch@claude-code-toolkitStep by step, with commands for each platform: Claude Code plugins: marketplaces, installing, and building your own
Questions about update-branch
How to install update-branch in Claude Code?
Run /plugin marketplace add rohitg00/awesome-claude-code-toolkit, then /plugin install update-branch@claude-code-toolkit. The plugin is ready to use after that.
What does the update-branch plugin do?
The plugin rebases a feature branch onto the main branch and resolves merge conflicts. It helps sync long-lived branches before merging into main or develop.
Which Git commands does update-branch use?
The plugin runs git rebase to update the branch and shows conflicting files if rebase does not complete automatically. Requires an initialized Git repository.
Source text
update-branch · Apache-2.0
Rebase and update feature branches with conflict resolution
© rohitg00 · Apache-2.0 · rohitg00/awesome-claude-code-toolkit