update-nanoclaw

To sync upstream changes without losing local modifications, use an automated process that performs preflight checks, creates an automatic backup branch and tag, and then applies a conflict-aware merge. This ensures your customized fork stays up to date safely.

The best way to cherry-pick specific updates while preserving local edits is to use selective syncing. This approach previews and categorizes upstream changes, letting you cherry-pick only the desired commits while automatically backing up your current state beforehand.

A preflight check and automatic backup work by creating a safety branch and tag before modifying anything. This mechanism validates your environment and secures your current codebase, providing a reliable rollback path if the upstream merge introduces conflicts or breaking changes.

Yes, you can detect breaking changes and validate your code after syncing from upstream. The update process includes automated validation and breaking-change checks post-merge, ensuring your customized installation remains stable and functional before finalizing the sync.

To roll back a failed upstream merge in a customized installation, utilize the automatic backup branch and tag created before the sync. The system provides rollback guidance to restore your repository to its exact pre-update state if conflicts or validations fail.

You should use rebase instead of merge to apply upstream updates when you need an advanced, linear project history. Rebase mode replays your local modifications on top of upstream changes, whereas merge preserves the exact chronological divergence and convergence of commits.