rebase
✓Guide for rebasing feature branches onto main in the Fusion Framework monorepo, including handling pnpm-lock.yaml conflicts
Installation
SKILL.md
This skill helps you rebase feature branches onto the latest main branch, handling common conflicts in a pnpm monorepo.
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.
When you encounter a "Version Packages (next)" commit with conflicts:
Guide for rebasing feature branches onto main in the Fusion Framework monorepo, including handling pnpm-lock.yaml conflicts Source: equinor/fusion-framework.
Facts (cite-ready)
Stable fields and commands for AI/search citations.
- Install command
npx skills add https://github.com/equinor/fusion-framework --skill rebase- Source
- equinor/fusion-framework
- Category
- </>Dev Tools
- Verified
- ✓
- First Seen
- 2026-02-01
- Updated
- 2026-02-18
Quick answers
What is rebase?
Guide for rebasing feature branches onto main in the Fusion Framework monorepo, including handling pnpm-lock.yaml conflicts Source: equinor/fusion-framework.
How do I install rebase?
Open your terminal or command line tool (Terminal, iTerm, Windows Terminal, etc.) Copy and run this command: npx skills add https://github.com/equinor/fusion-framework --skill rebase Once installed, the skill will be automatically configured in your AI coding environment and ready to use in Claude Code or Cursor
Where is the source repository?
https://github.com/equinor/fusion-framework
Details
- Category
- </>Dev Tools
- Source
- skills.sh
- First Seen
- 2026-02-01