skills.rest
friedbotstudio
friedbotstudioOFFICIAL
Explore all skills by this author →
GitHub

upgrade-project

Reconcile staged baseline upgrade conflicts in project files.

5|Updated Apr 29, 2026
Search Tags:#merge#conflict resolution#baseline#reconciliation#upgrade#semantic merge
One-click install
npx skills add https://github.com/friedbotstudio/baseline --skill upgrade-project-friedbotstudio
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: upgrade-project
Source: https://github.com/friedbotstudio/baseline/tree/main/.claude/skills/upgrade-project
Command: npx skills add https://github.com/friedbotstudio/baseline --skill upgrade-project-friedbotstudio

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill resolves baseline upgrade conflicts that require semantic merging, letting an agent reconcile staged files instead of guessing or leaving upgrade work unfinished.

Core Features & Use Cases

  • Staged Merge Reconciliation: Reads the upgrade stage manifest, inspects BASE, INCOMING, and LOCAL content, and writes a reconciled result back to the project.
  • Structural Conflict Handling: Handles baseline edits that collide with user edits at the same structural anchor, including renumbering and other zero-drift merge cases.
  • Safety and Recovery: Validates paths, supports dry-run previews, records reconciliation markers, and falls back to targeted user input when intent is ambiguous.
  • Use Case: A project upgrade introduces new baseline content while the user has customized the same file; this Skill combines both sides cleanly and finalizes the stage.

Quick Start

Ask the skill to reconcile the staged baseline upgrade files in the current project and apply the resolved changes.

Frequently Asked Questions about upgrade-project

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

FAQPage Schema
How do I resolve baseline upgrade conflicts when my local edits collide with incoming changes?▼

Baseline upgrade conflicts are reconciled through semantic merge stages that inspect BASE, INCOMING, and LOCAL file content, then write a combined result back to the project using manifest-driven file inspection.

What is three-way reconciliation for staged project files during an upgrade?▼

Three-way reconciliation is a semantic merge process that reads an upgrade stage manifest, inspects the base, incoming, and local versions of pending files, and combines both sides cleanly at structural anchors to finalize the stage.

How do I handle structural merge conflicts like renumbering during a project baseline upgrade?▼

Structural conflicts during baseline upgrades are handled through zero-drift semantic merging that addresses collisions at shared structural anchors, including renumbering cases, ensuring the reconciled result preserves both baseline and user edits.

Can I preview staged file reconciliation changes before applying them to my project?▼

Yes, staged file reconciliation supports dry-run previews that validate paths and display the proposed semantic merge results before any resolved entries are written back to the project files.

What happens when merge intent is ambiguous during a baseline upgrade reconciliation?▼

When intent is ambiguous during baseline upgrade reconciliation, the process falls back to targeted user input to resolve the conflict safely, then records best-effort reconciliation markers after each resolved entry.

Do I need a manifest file to perform a semantic merge of staged upgrade files?▼

Yes, manifest-driven file inspection is required to identify pending files and read the BASE, INCOMING, and LOCAL content needed for two-way or three-way reconciliation during a baseline upgrade.

Related Skills

Explore More Software Engineering Skills→
Atrium-HermesAtrium-Hermes

v4-readiness

Validate aeon.yml, skills.json, and MEMORY.md against the v4 change manifest.

Community
Advanced
Jason-hub-starJason-hub-star

sprint-docs-sync

Synchronize sprint metadata and feature changes across project documentation and status files.

Community
Intermediate
diShine-digital-agencydiShine-digital-agency
1

shine-reapply-patches

Merge saved user-local patches back into updated SHINE installations.

Community
Advanced
CuriousLearnerCuriousLearner
27

conflict-resolver

Analyze Git merge conflict types and propose automated or manual resolution strategies.

Community
Advanced