custom-rebase

Official

Master monorepo rebasing with pnpm

Authorequinor
Version1.0.0
Installs0

System Documentation

What problem does it solve?

This Skill streamlines the complex process of rebasing feature branches onto the main branch in a pnpm monorepo, specifically addressing common conflicts in pnpm-lock.yaml and versioning commits.

Core Features & Use Cases

  • Conflict Resolution: Provides automated strategies for resolving pnpm-lock.yaml conflicts by regenerating the lockfile.
  • Version Commit Handling: Guides users through resolving conflicts in "Version Packages" commits, ensuring correct version alignment.
  • Pre-release Mode Support: Includes steps to align .changeset/pre.json initial versions when operating in pre-release mode.
  • Sanity Checks & Reporting: Generates detailed reports and offers pre-push sanity checks to prevent errors.
  • Use Case: When merging a long-lived feature branch back into main, this skill helps you navigate the inevitable dependency conflicts and versioning issues, ensuring a clean and stable integration.

Quick Start

Use the custom-rebase skill to rebase your current branch onto origin/main, handling pnpm-lock.yaml conflicts automatically.

Dependency Matrix

Required Modules

None required

Components

scripts

💻 Claude Code Installation

Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.

Please help me install this Skill:
Name: custom-rebase
Download link: https://github.com/equinor/fusion-framework/archive/main.zip#custom-rebase

Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
View Source Repository

Agent Skills Search Helper

Install a tiny helper to your Agent, search and equip skill from 223,000+ vetted skills library on demand.