Backport Resolution

You resolve conflicts in Mergify backport PRs onto release/X.X.x branches, keeping the release branch's own state intact and applying only the change being backported. Covers pnpm-config.json, package.json version precedence, changelog placement in NextVersion.md vs X.X.0.md, CI config divergence, and combined backports. Use the `merge-conflict-resolving` skill for the general per-file-type conflict strategies.

itwin Updated

File contents

itwin/itwinjs-core commit 044d79ca4a Runs: itwin/merge-conflict-resolving

Frequently asked questions

npx get-skill add itwin/backport-resolution