Skip to main content
plugin

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

Install into Claude Code · Plugin marketplace All methods and platforms ↓
/plugin marketplace add rohitg00/awesome-claude-code-toolkit
/plugin install update-branch@claude-code-toolkit
Open on GitHub

What 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 develop branch
  • 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 main and show conflicts
  • Update feature branch feature/user-auth with develop
  • Run /update-branch:rebase for branch bugfix/api-timeout

How to install update-branch

Plugin marketplace

/plugin marketplace add rohitg00/awesome-claude-code-toolkit
/plugin install update-branch@claude-code-toolkit

Step 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

Similar plugins

All plugins for Git and GitHub →

From the same set178

The whole set →
workflow-optimizer The workflow-optimizer plugin analyzes development workflows and suggests ways to improve them. Use it when you want recommendations on how work in a project is organized. ★ 2,858repo stars web-dev web-dev — a plugin for Claude Code that automates full-stack web app creation: generates project structure, components, and pages in a single step. ★ 2,858repo stars visual-regression Runs visual regression testing via screenshot comparison in Claude Code. Pinpoints unwanted layout shifts right after styling changes. ★ 2,858repo stars vision-specialist Analyzes images, extracts text from screenshots, and interprets visual content. Triggered by /vision-specialist:analyze or when working with images. ★ 2,858repo stars unit-test-generator unit-test-generator generates unit tests for any function or module in Claude Code. Useful when you need to cover code with tests without writing boilerplate scenarios by hand. ★ 2,858repo stars ultrathink The ultrathink plugin enables deep analysis with extended reasoning, aimed at complex problems that need more than a brief response. ★ 2,858repo stars ui-designer ui-designer — a Claude Code plugin that generates UI components from design specs with pixel precision. Runs when you need to turn a mockup into code without manual layout work. ★ 2,858repo stars type-migrator type-migrator converts JavaScript source files to TypeScript with accurate type definitions. Runs during codebase modernization and legacy refactoring passes. ★ 2,858repo stars

Project sponsors

Companies that keep this analytics open