merge

Name: merge
Author: withastro

github.com/withastroDevelopment63.7k318 installsUpdated today

About merge

A skill for handling the merge process from main to next. It selects a stage-specific sub-skill for conflict resolution, CI fixes, or stale Changeset cleanup.

Key features

01Select a sub-skill by process stage
02Resolve Git merge conflicts
03Fix build, type, and test failures
04Remove stale Changeset files

Use cases

01Run the main-to-next merge process
02Resolve conflicts during a merge
03Address CI failures and outdated records after merging

Install

Copy the command and run it in a terminal.

$npx skills add https://github.com/withastro/astro --skill merge

After installing, type/mergein Claude Code to confirm it loaded.

Bundled files

References and scripts installed along with SKILL.md.

clean-changesets.md

fix-ci.md

resolve-conflicts.md

evals/

evals.json

Details

From the project README

Merge

Handle the main-to-next merge process. This skill has sub-skills for each stage:

resolve-conflicts.md — Resolve git merge conflicts
fix-ci.md — Fix build errors, type errors, and test failures
clean-changesets.md — Remove stale changeset files

When invoked, check the step argument to determine which sub-skill to run, then read and follow that file's instructions.

Comments

Markdown supported

Details

Author: withastro
Repository: withastro/astro
Category: Development
Installs: 318
GitHub stars: 63,701

Report

More skills

All skills

remotion-render

github.com/inference-sh

1.6M

Render videos from React/Remotion component code via inference.sh. Pass TSX code, get MP4. Supports all Remotion APIs: useCurrentFrame, useVideoConfig, spring, interpolate, AbsoluteFill, Sequence. Configurable resolution, FPS, duration, codec. Use for: programmatic video generation, animated graphics, motion design, data-driven videos, React animations to video. Triggers: remotion, render video from code, tsx to video, react video, programmatic video, remotion render, code to video, animated video, motion graphics code, react animation video

improve-codebase-architecture

github.com/mattpocock

1.2M

Scan a codebase for architecture improvement opportunities, present them as a visual HTML report, then dive deep into whichever one you pick.

design-mobile-apps

github.com/designed-by-ai

1.2M

Design mobile app screens with Sleek, edit Sleek projects, and implement their designs in React Native or HTML

vercel-react-best-practices

github.com/vercel-labs

867.3k

React and Next.js performance optimization guidelines from Vercel Engineering. This skill should be used when writing, reviewing, or refactoring React/Next.js code to ensure optimal performance patterns. Triggers on tasks involving React components, Next.js pages, data fetching, bundle optimization, or performance improvements.