safe-merge-update
Installation
SKILL.md
Safe Merge Update
Merges upstream OpenClaw changes into your fork while preserving all custom code: plugin registrations, custom UI tabs, workspace skills, controllers, and state extensions.
⚠️ Operator Warnings — Read Before Running
This skill performs high-impact, partially irreversible operations. Understand what it does before executing in a production environment:
| Operation | Phase | Impact |
|---|---|---|
git merge upstream/main |
Phase 1 | Creates safe-merge-YYYY-MM-DD branch and merges — no changes to local-desktop-main |
npm run build / pnpm run build |
Phase 1 | Downloads packages if lockfile changed (network); builds in place |
systemctl --user restart openclaw-gateway |
Phase 1 | Restarts the live gateway — brief downtime; gateway now runs from safe-merge build |
Conflict resolution via claude CLI |
Phase 1 (optional) | Passes redacted file content to the Claude API; Edit+Read tools only — Bash explicitly excluded |
git push --force to TARGET_REMOTE/TARGET_BRANCH |
Phase 2 only (--promote) |
Overwrites remote branch — only runs after user confirms gateway is healthy |
git branch -D safe-merge-* |
Phase 2 only (--promote) |
Deletes temp branch after successful promotion |