update

Merge upstream BastionClaw changes while preserving user data and customizations.

30|3|Updated Feb 21, 2026

Search Tags:#git #safety #merge #containers #update #conflicts #upstream

Ready to run

npx skills add https://github.com/harperaa/bastionclaw --skill update-harperaa

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: update
Source: https://github.com/harperaa/bastionclaw/tree/main/.claude/skills/update
Command: npx skills add https://github.com/harperaa/bastionclaw --skill update-harperaa

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Upgrading BastionClaw from upstream traditionally risks overwriting user data, customizations, or per-skill configurations. This Skill provides a safe, auditable upgrade workflow that preserves personal data and merges changes cleanly, reducing downtime and manual merge effort.

Core Features & Use Cases

Detects conflicts between upstream changes and local edits.
Guides three-way merging and safe rollbacks.
Works with containerized environments and protects Green/Yellow/Red data zones to avoid data loss.

Quick Start

Run the update tool to fetch upstream changes and resolve conflicts with guided prompts.

Frequently Asked Questions about update

High-intent search queries and answers about installing and using this skill.

FAQPage Schema

How do I safely merge upstream updates without overwriting local customizations?▼

To safely merge upstream updates without overwriting local customizations, you need an auditable workflow that performs a three-way diff and guides conflict resolution. This process preserves user data and per-skill configurations while cleanly applying code and container updates.

What is the best way to resolve git merge conflicts during a container update?▼

Resolving git merge conflicts during a container update requires a three-way diff mechanism that detects conflicts between upstream changes and local edits. Guided prompts then help you safely merge configuration updates and protect user data zones from loss.

How does a three-way diff protect user data during an upstream merge?▼

A three-way diff protects user data during an upstream merge by comparing the upstream base, new upstream changes, and local edits to identify exact conflicts. This ensures your local customizations are preserved while cleanly integrating new code and configuration updates.

Does this upstream merge workflow work with containerized environments?▼

Yes, this upstream merge workflow works directly with containerized environments to apply code updates and configuration merges safely. It protects Green, Yellow, and Red data zones to prevent data loss across all user zones during the update process.

Can I rollback an upstream merge if conflicts cause data loss?▼

Yes, you can rollback an upstream merge if conflicts cause data loss because the workflow includes safe rollback capabilities alongside guided conflict resolution. This ensures you can revert to a previous state if an update fails or compromises your local customizations.

What are the limitations of a guided conflict resolution process?▼

The limitations of a guided conflict resolution process include requiring user intervention to resolve complex conflicts between upstream changes and local edits. While it provides a robust preflight and three-way diff, manual guidance is still necessary to ensure safe merges across all data zones.