merge-to-staging

What problem does it solve?

This Skill automates merging a feature branch into a fresh staging branch so you always produce a clean, up-to-date staging snapshot without local residue or manual merge toil. It minimizes risky manual merges by recreating staging from remote, analyzing conflicts with confidence scores, and performing safe automated resolutions where possible.

Core Features & Use Cases

• Fresh staging recreation: Deletes any local staging branch and checks out a new local staging from origin/staging to ensure a known good base.
• Automated merge and conflict analysis: Runs the merge, classifies conflicts (trivial, simple, complex), assigns confidence scores, and auto-resolves conflicts with ≥90% confidence.
• Semi-automatic handling for complex conflicts: Batches detailed conflict analyses for user review and applies user-approved resolutions, then commits and pushes to origin/staging.
• Use Cases: Preparing a feature for staging deployment, consolidating multiple feature changes safely, and reducing CI pipeline surprises before test or pre-release validation.

Quick Start

Merge your current feature branch into a freshly recreated staging branch with automated conflict analysis, push the updated staging branch to origin, and return to your feature branch.