The dev → main promotion PR #9 is conflicting because main release commits are not ancestors of dev. Merge current main into dev with a merge commit before retrying the release promotion. Preserve the reviewed TypeMCP 0.2.2 examples remediation already on dev. Acceptance: no content regression; clean install, check, runnable examples, audit; exact-head approval and CI. Non-goal: feature changes.
The
dev → mainpromotion PR #9 is conflicting because main release commits are not ancestors of dev. Merge current main into dev with a merge commit before retrying the release promotion. Preserve the reviewed TypeMCP 0.2.2 examples remediation already on dev. Acceptance: no content regression; clean install, check, runnable examples, audit; exact-head approval and CI. Non-goal: feature changes.