skills.rest
sqfzy
sqfzyCOMMUNITY
Explore all skills by this author →
GitHub

merge

Merge upstream branches or port features with backup and rollback safeguards.

Updated Jul 5, 2025
Search Tags:#git#merge#branch#port#conflicts#upstream
One-click install
npx skills add https://github.com/sqfzy/my_configs --skill merge-sqfzy
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: merge
Source: https://github.com/sqfzy/my_configs/tree/main/claude/skills/merge
Command: npx skills add https://github.com/sqfzy/my_configs --skill merge-sqfzy

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

The Merge skill helps teams safely synchronize their code with upstreams or selectively port features from an external library into a target codebase, including backup, preview, build verification, and rollback safeguards.

Core Features & Use Cases

  • Sync mode: merge upstream into your branch with upstream rules and conflicts handled according to the chosen strategy.
  • Port mode: selectively transplant features from an independent library into the target codebase, adapting to project style and dependencies.
  • Use Case: when you need to stay aligned with upstream changes or incorporate a library feature into production code while preserving safety nets.

Quick Start

Initiate a safe upstream merge or a selective port from an external library into the current project.

Frequently Asked Questions about merge

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

FAQPage Schema
How do I safely merge an upstream branch into my current git repository?▼

To safely merge upstream branches, this automation enforces dry-runs, creates backups, analyzes conflicts, and generates structured reports to ensure clean upstream synchronization.

What is the best way to port a specific feature from an external library into my codebase?▼

Porting a feature from an external library is handled by selectively transplanting the code into your target codebase while adapting to project style and dependencies. This mode ensures clean cross-repo feature transplantation for multi-repo projects.

Can I preview a git merge and rollback changes if conflicts break my build?▼

Yes, you can preview and rollback changes. The workflow enforces dry-run modes and creates backup safeguards, allowing you to analyze conflicts and execute rollbacks if build verification fails during synchronization.

How do you handle git merge conflicts when synchronizing with an upstream repository?▼

Handling git merge conflicts during upstream synchronization involves structured conflict analysis and applying conflict strategies chosen during the workflow. This ensures clean merges while preserving necessary safety nets and rollback options.

Does this cross-repo porting workflow support auto mode for multi-repo projects?▼

Yes, the cross-repo porting workflow supports auto mode for multi-repo projects. It enforces both dry-run and auto modes within its phase-based workflows to selectively transplant features across repositories safely.

Related Skills

Explore More Software Engineering Skills→
Tx1207Tx1207
5

project-creator

Create a new project from a template, initialize uv, and configure a local Git repository.

Community
Advanced
MoonLadderStudiosMoonLadderStudios
12

fix-merge-conflicts

Fetch origin/main, merge into the current branch, resolve conflicts, and push.

Official
Intermediate
Asymmetric-alAsymmetric-al
417

lint-and-validate

Lint and validate Node.js, TypeScript, and Python code for syntax and standards.

Official
Intermediate
Sumeet138Sumeet138
1

git-advanced-workflows

Guide interactive rebases, cherry-picking, bisecting, worktrees, and reflog across Git branches.

Community
Advanced