rebase-upstream

Rebase a Git branch onto an upstream tag with conflict resolution and build verification.

4|2|Updated Feb 26, 2026

Search Tags:#git #ci/cd #version control #merge conflicts #rebase #upstream

Ready to run

npx skills add https://github.com/Clawdi-AI/openclaw --skill rebase-upstream

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: rebase-upstream
Source: https://github.com/Clawdi-AI/openclaw/tree/main/.agents/skills/rebase-upstream
Command: npx skills add https://github.com/Clawdi-AI/openclaw --skill rebase-upstream

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

This Skill automates the process of updating your local feature branch with the latest changes from the main project's upstream repository, ensuring your work is based on the most current code.

Core Features & Use Cases

Conflict Resolution: Intelligently merges upstream changes into your branch, providing a clear strategy for resolving merge conflicts.
Build Verification: Ensures the project builds successfully after each step of the rebase, preventing broken code from being integrated.
Use Case: When the main openclaw/openclaw repository releases a new version, you can use this Skill to rebase your feature branch onto the new tag, incorporating all upstream updates and resolving any conflicts.

Quick Start

Rebase the current branch onto the upstream tag 'v2026.2.14'.

Frequently Asked Questions about rebase-upstream

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

FAQPage Schema

How do I rebase a Git branch onto an upstream tag while resolving merge conflicts?▼

To rebase a Git branch onto an upstream tag, this Skill automates the process using an upstream-first conflict resolution strategy, ensuring your local feature branch incorporates all upstream changes cleanly.

How can I verify my project builds successfully after a Git rebase?▼

You can verify your project builds successfully after a Git rebase because this Skill integrates automated build verification and tests at each step, preventing broken code from integrating into your branch.

Does this automated Git rebase handle pnpm dependency updates?▼

Yes, this Git rebase process handles pnpm dependency updates automatically, managing your project dependencies alongside upstream changes to maintain code integrity throughout the integration.

What is the best way to sync a feature branch with upstream repository changes?▼

The best way to sync a feature branch with upstream repository changes is using an automated rebase process that integrates new tags, resolves conflicts upstream-first, and runs build tests.

When do I need to rebase my local branch onto a specific upstream ref?▼

You need to rebase your local branch onto a specific upstream ref when the main project repository releases a new version or tag, and you must update your feature branch with those latest upstream updates.

Why does an upstream-first conflict resolution strategy matter during a Git rebase?▼

An upstream-first conflict resolution strategy matters during a Git rebase because it intelligently prioritizes integrating the main project's changes, providing a clear, structured approach to resolving merge conflicts.