Begin of the insertionEnd of the insertion ### What Begin of the insertion

End of the insertion Begin of the deletion

FixEnd of the deletion `script/merge-upstream` Begin of the deletion in openproject-octiconsEnd of the deletion (copied from primer_view_components with view_components-specific Begin of the insertion
End of the insertion bugs) Begin of the insertionwas repaired,End of the insertion and Begin of the deletion captureEnd of the deletion the fork-sync workflow Begin of the insertioncapturedEnd of the insertion as a reusable agent skill. Begin of the insertion

End of the insertion Begin of the deletion

Branch: `code-maintenance/merge-upstream-skill`

End of the deletion ### Begin of the insertionStatus

End of the insertion Begin of the deletion Changes

End of the deletion - Begin of the insertion**merge-upstream script fixes — DONE, merged to `main`** (commit `be20037d`):
-End of the insertion Correct upstream remote URL to `primer/octicons` (was `view_components`) Begin of the insertion
End of the insertion Begin of the deletion
End of the deletion - Tolerate expected merge conflicts (`|| true`) so the script completes Begin of the insertionunder `set -e`
End of the insertion Begin of the deletion
End of the deletion - Auto-detect GNU/BSD `sed` for macOS portability Begin of the insertion
End of the insertion Begin of the deletion
End of the deletion - Scope changeset rename to the exact `@primer/octicons` token (no longer mangles Begin of the insertion
End of the insertion `@primer/octicons-react` / `@primer/styled-octicons`) Begin of the insertion
End of the insertion Begin of the deletion
End of the deletion - Rebuild assets via `yarn install && yarn build`, stage `lib/`, `yarn.lock` Begin of the insertion
End of the insertion Begin of the deletion
End of the deletion - Begin of the insertion**`syncing-primer-fork`End of the insertion Begin of the deletion Add `syncing-primer-fork`End of the deletion skill Begin of the insertion— in review**, PR #213:
https://github.com/opf/openproject-octicons/pull/213

End of the insertion Begin of the deletion documenting the merge-parent-of-version-bump procedure, npm/yarn conflict split, and the `merge.ours.driver` prerequisite

End of the deletion ### Risk Assessment Begin of the insertion

End of the insertion Begin of the deletion

End of the deletion - [x] **Low risk** — tooling/docs only, no shipped package code changed Begin of the insertion

End of the insertion Begin of the deletion

End of the deletion ### Checklist Begin of the insertion

End of the insertion Begin of the deletion

End of the deletion - Begin of the insertion[x] merge-upstream fixes merged to main
-End of the insertion [ ] Begin of the insertionSkillEnd of the insertion PR Begin of the insertion#213End of the insertion Begin of the deletion opened andEnd of the deletion reviewed Begin of the insertionand merged
End of the insertion Begin of the deletion
End of the deletion - [ ] Port equivalent fixes to primer_view_components