rebase

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:

دليل لإعادة تأسيس فروع الميزات إلى الرئيسية في Fusion Framework monorepo، بما في ذلك التعامل مع تعارضات pnpm-lock.yaml المصدر: equinor/fusion-framework.