skills.rest
Epiphytic
EpiphyticOFFICIAL
Explore all skills by this author →
WebsiteGitHub

rebase

Rebase Git branches onto remote targets with structured conflict resolution guidance.

7|Updated Feb 6, 2026
Search Tags:#git#developer workflow#branch management#rebase#conflict resolution#source control
One-click install
npx skills add https://github.com/Epiphytic/ai-plugin-translator --skill rebase-epiphytic
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: rebase
Source: https://github.com/Epiphytic/ai-plugin-translator/tree/main/packages/core/test/fixtures/regression-output/workmux/skills/rebase
Command: npx skills add https://github.com/Epiphytic/ai-plugin-translator --skill rebase-epiphytic

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill helps developers update branches through controlled Git rebases while reducing the risk of losing changes during conflict resolution.

Core Features & Use Cases

  • Smart Rebase Workflow: Handles local branches, remote branches, and fetched remote targets based on user-provided arguments.
  • Conflict Resolution Guidance: Reviews target branch history before resolving conflicts to preserve changes from both branches.
  • Use Case: Developers can rebase a feature branch onto main or a remote branch while following a careful process for handling merge conflicts.

Quick Start

Use the rebase skill to rebase the current branch onto the latest main branch and resolve conflicts carefully.

Frequently Asked Questions about rebase

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I rebase a local branch onto a remote branch without losing changes?▼

To rebase a local branch safely, the workflow fetches the remote target, executes the Git rebase operation, and reviews branch history to preserve conflicting changes during resolution.

What is the best way to resolve merge conflicts during a Git rebase?▼

Resolving merge conflicts during a Git rebase involves reviewing the target branch history first, then applying structured guidance to preserve changes from both branches safely.

How do I update my feature branch with the latest main branch using rebase?▼

Updating a feature branch via rebase requires parsing the main branch target, fetching updates if needed, and executing the rebase to apply your commits onto the latest changes.

Can I rebase onto a fetched remote branch if I only have local source control?▼

Yes, the rebase workflow supports fetched remote targets by fetching the remote branch data first, then executing the rebase operation against your local branch.

Why does my Git rebase lose changes when conflicts occur?▼

Git rebase can lose changes if conflicts are resolved without reviewing history; this workflow prevents loss by reviewing target branch history to preserve conflicting changes from both branches.

When should I not use Git rebase for branch management?▼

Git rebase is not recommended for shared branches where collaborative updates are active, as rewriting history can cause source control conflicts for other developers.

Related Skills

Explore More Software Engineering Skills→
dyoshikawadyoshikawa
1

rebase-latest-main

Rebase a local git branch onto the latest remote main.

Community
Intermediate
kv0906kv0906
134

push

Stage all changes, generate commit messages, and push to the remote repository.

Community
Intermediate
potetopoteto
218

worktree

Create and manage isolated git worktrees for concurrent branch work.

Community
Advanced
rafaelromaorafaelromao
5

sandman-back-merge

Merge a base branch into the current branch without rewriting history.

Community
Advanced