update-NinjaClaw

To safely merge upstream changes into a customized git repository, this skill automates preflight checks, creates a rollback point, and applies controlled integration using merge, cherry-pick, or rebase workflows. It preserves local modifications while bringing in upstream improvements.

Cherry-picking upstream commits without losing local modifications is handled through a controlled workflow that previews conflicts, categorizes impacted files, and creates timestamped backup branches before applying changes, ensuring fast recovery and local preservation.

Yes, you can preview git conflicts before applying an upstream rebase. The skill surfaces upstream changes since your base, categorizes impacted files, and provides a conflict preview to help you select the best integration strategy.

Rolling back a failed upstream merge in git is achieved using the timestamped backup branch and tag created before any changes were applied. This safeguard enables fast recovery if the integration fails validation or introduces breaking changes.

Yes, the upstream update workflow handles breaking changes and migrations. It validates the update with tests and builds, surfaces breaking changes, and provides optional migration steps while checking for related skill migrations after applying updates.

Yes, you need a clean git working tree before integrating upstream updates. The preflight safety checks verify a clean working tree and the presence of an upstream remote before creating a backup and starting the merge or cherry-pick process.