update-nanoclaw

To sync a customized fork with upstream without losing local modifications, use a workflow that detects upstream remotes, previews changes, and applies updates via merge, cherry-pick, or rebase. This preserves local changes while bringing in upstream updates.

The safest way to handle merge conflicts during an upstream sync is to perform a dry-run conflict detection first, then open only the conflicted files for targeted conflict-marker resolution. Creating a backup branch before executing the sync ensures low-risk rollback.

Yes, you need to create a timestamped backup branch and tag before rebasing your local install onto a new upstream version. This provides exact reset commands and a low-risk rollback path if the rebase introduces unexpected issues.

To validate a git rebase or merge after syncing upstream changes, run npm build and test validations immediately after execution. Additionally, check the CHANGELOG.md for [BREAKING] entries and run referenced migration skills to prevent build failures.

Yes, you can selectively cherry-pick specific upstream commits instead of merging the entire branch. The upstream sync workflow supports selective cherry-picks, allowing you to preview changes and apply only the desired commits to your local fork.

Update-nanoclaw performs a git-based preflight safety check before executing an upstream merge to assess conflict risk and ensure the working tree is clean. This prevents data loss and identifies potential merge conflicts before they disrupt the update process.