Rebase Skill (Fusion Framework)

This skill helps you rebase feature branches onto the latest main branch, handling common conflicts in a pnpm monorepo.

Overview

When rebasing a feature branch, you'll often encounter conflicts in pnpm-lock.yaml due to parallel dependency changes. The correct approach is to regenerate the lockfile rather than manually resolving conflicts.

Standard Rebase Workflow

1. Prepare for rebase

# Navigate to your worktree or branch
cd /path/to/worktree

# Ensure you're on the correct branch
git branch