Resolve CDS version-file conflicts

CDS ships many packages that are kept version-locked by yarn release. When both master and the current branch bump package versions independently, a rebase (or merge) collides on two file types only:

• packages/<pkg>/package.json — the "version" field
• packages/<pkg>/CHANGELOG.md — the top-of-file version entries

This skill resolves only those two file types mechanically. Anything else that conflicts must be raised to the user.

When to run

Trigger this flow when EITHER: