skills.rest
shannonshell
shannonshellOFFICIAL
Explore all skills by this author →
GitHub

merge-upstream

Apply a curated upgrade workflow for Nushell and Reedline subtree pulls.

11|1|Updated Mar 22, 2026
Search Tags:#workflow#upgrade#nushell#upstream#reedline#fork-management
One-click install
npx skills add https://github.com/shannonshell/shannon --skill merge-upstream
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: merge-upstream
Source: https://github.com/shannonshell/shannon/tree/main/.claude/skills/merge-upstream
Command: npx skills add https://github.com/shannonshell/shannon --skill merge-upstream

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) components.

What problem does it solve?

Shannon often drifts from upstream Nushell and Reedline. This skill provides a controlled, reproducible upgrade path that preserves Shannon's fork and avoids noisy auto-merges.

Core Features & Use Cases

  • Curated upgrade workflow: coordinates nushell and reedline subtree updates with Shannon-specific patches.
  • Conflict management: guides through branch-off, patch reapplication, and selective conflict resolution to keep changes intact.
  • Build verification: runs cargo build and tests to ensure upgrades work before merging.
  • Documentation & repeatability: records the upgrade sequence for future upgrades and audits.

Quick Start

Create a feature branch and run the upgrade workflow to fetch upstream, reapply Shannon patches, and validate the build.

Frequently Asked Questions about merge-upstream

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

FAQPage Schema
How do I merge upstream Nushell and Reedline updates into my fork without losing custom patches?▼

To merge upstream Nushell and Reedline safely, use a curated upgrade workflow that handles branch-off, subtree pulls, patch reapplication, and conflict management to preserve your fork's custom files during the update.

What is the best way to manage conflicts when pulling upstream Nushell subtree updates?▼

Managing conflicts during upstream Nushell subtree pulls requires a guided workflow that coordinates selective conflict resolution and patch reapplication, ensuring Shannon-specific fork changes remain intact while integrating upstream updates cleanly.

How do I verify my Nushell fork build after applying upstream upgrades?▼

Verify your Nushell fork build after upstream upgrades by running cargo build and executing tests within the workflow, ensuring the merged code compiles and functions correctly before finalizing the upgrade.

Can I use an automated merge for upgrading a Nushell fork from upstream?▼

Automated merges are not recommended for upgrading a Nushell fork because they create noisy auto-merges that risk overwriting custom patches; a controlled, reproducible workflow avoids this by enforcing preservation of fork-specific files.

What steps are involved in a reproducible Nushell fork upgrade workflow?▼

A reproducible Nushell fork upgrade workflow involves preflight checks, fetching upstream subtrees, reapplying Shannon patches, resolving conflicts selectively, bumping versions, and documenting the sequence for future audits.

Why does my Shannon fork drift from upstream Nushell and Reedline?▼

Shannon drifts from upstream Nushell and Reedline due to independent development timelines, requiring a controlled upgrade path that aligns the fork with upstream changes while maintaining its specific patches and version bumps.

Related Skills

Explore More Software Engineering Skills→
corvo007corvo007
793

using-git-worktrees

Creates Git worktrees for isolated feature development, ensuring directories are safe and ready for use.

Community
Intermediate
edgeandnodeedgeandnode

code-test

Run targeted cargo test commands for Rust workspace code changes.

Official
Intermediate
heikopanjasheikopanjas

semantic-versioning

Determine and apply MAJOR, MINOR, or PATCH version bumps in project manifests.

Community
Intermediate
stevengonsalvezstevengonsalvez

update-skills

Detect upstream commits and merge updates into installed skill branches.

Community
Advanced