skills.rest
Motion-Creative
Motion-CreativeOFFICIAL
Explore all skills by this author →
WebsiteGitHub

update-and-merge

Merge local, ancestor, and upstream files with three-way conflict resolution.

3|Updated Apr 11, 2026
Search Tags:#GitHub#merge#version updates#user instructions#three-way diff#admin approvals#semantic conflict detection
One-click install
npx skills add https://github.com/Motion-Creative/runneth-apps --skill update-and-merge
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: update-and-merge
Source: https://github.com/Motion-Creative/runneth-apps/tree/main/update-and-merge
Command: npx skills add https://github.com/Motion-Creative/runneth-apps --skill update-and-merge

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill requires use-case-sync, OPENAI_API_KEY, GITHUB_TOKEN.

What problem does it solve?

Runneth use-case updates can silently overwrite changes your team intentionally made, or force admins to manually decide what’s safe versus what needs careful review.

Core Features & Use Cases

  • Per-file three-way merge with conflict awareness: compares local edits, the installed ancestor version, and the new upstream version to decide what can be updated safely.
  • Semantic conflict detection for user.md rules: uses an LLM check to catch cases where an upstream change would override or weaken instructions your team wrote elsewhere in user.md.
  • Plan mode for real conflicts: when any part conflicts, nothing is partially updated; instead, a consolidated, human-readable plan is written for admin review and resolution.

Quick Start

Run an update scan on any installed use case and, if a plan appears, reply with your preference for each conflicting file in plain language.

Frequently Asked Questions about update-and-merge

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

FAQPage Schema
How do I merge upstream updates without overwriting local changes?▼

To merge upstream updates without overwriting local changes, perform a per-file three-way merge comparing local content, the installed ancestor version, and upstream HEAD to prevent silent overwrites.

What is a three-way merge for version updates?▼

A three-way merge for version updates compares your local edits, the original installed ancestor file, and the new upstream HEAD to automatically identify safe updates and isolate genuine conflicts.

How does semantic conflict detection work for user.md rules?▼

Semantic conflict detection for user.md rules uses an OpenAI-backed LLM check to catch cases where an upstream change would override or weaken specific instructions your team wrote.

Do I need admin approvals to resolve merge conflicts?▼

Yes, you need admin approvals to resolve merge conflicts; admins must choose to apply upstream, keep local, or create a blended custom merge when the system generates a consolidated plan.

What happens when a three-way merge encounters real conflicts?▼

When a three-way merge encounters real conflicts, nothing is partially updated; instead, a consolidated, human-readable plan is generated for admin review and resolution.

Do I need a GitHub token to retrieve upstream versions?▼

Yes, you need a GitHub token to retrieve upstream versions; GitHub-backed retrieval fetches the ancestor and upstream HEAD required to generate atomic applies.

Related Skills

Explore More Software Engineering Skills→
samuelmukotisamuelmukoti

github-auth

Detect and configure GitHub authentication via HTTPS, SSH, or gh CLI.

Community
Advanced
cicero78Mcicero78M

speckit-plan

Generate data-model.md, contracts/, and quickstart.md from plan templates.

Community
Intermediate
dobrinz123dobrinz123

gsd-reapply-patches

Reapply local modifications to restored GSD files via three-way merge.

Community
Advanced
chiptoe-svgchiptoe-svg

update-skills

Detect and merge upstream updates for git branch-distributed skills.

Community
Intermediate