Skip to content
cccskills
FreePublished on GitHub

merge

Guide an existing Remotion pull request through automated checks and merge it when eligible. Resolve conflicts, investigate failed checks, fix genuine problems, and use the flake skill to rerun checks that fail intermittently.

OriginalShow the original description

Wait for a Remotion pull request to become mergeable, handle merge conflicts, distinguish genuine CI failures from flakes, rerun flaky checks through the flake skill, and merge the PR. Use when asked to run /merge, merge a current PR after checks pass, or shepherd a Remotion PR through CI to merge.

Works withGitHub
See how to install

Good for

  • Merging a pull request after required checks pass
  • Resolving conflicts that prevent a merge
  • Investigating and fixing failed automated checks
  • Rerunning intermittently failing checks

Files included (1)

  • SKILL.md2.0 KB

SKILL.md (original)

Review the instructions the agent will receive before you install.

/merge

Use this skill for an existing pull request in the Remotion monorepo.

Loop

Start from the top after every pushed fix, conflict resolution, CI rerun, or other state change:

  1. Identify the PR:
gh pr view --json number,url,state,isDraft,baseRefName,headRefName,mergeable,mergeStateStatus,reviewDecision,statusCheckRollup
  1. If the PR is draft, closed, blocked by requested changes, missing required approval, or otherwise not eligible to merge for a non-CI reason, stop and report the blocker.

  2. If GitHub reports merge conflicts, resolve them using the pr-ready workflow. Commit and push the resolution when needed, then start this loop from the top.

  3. Wait for checks:

gh pr checks --watch --interval 30
  1. If all required checks pass and the PR is mergeable, merge it:
gh pr merge --merge --delete-branch

If the repository or PR clearly requires another merge method, use that method instead.

CI Failures

When checks fail, inspect the failed jobs and logs before deciding what to do:

gh pr checks --watch=false
gh run view <run-id> --json databaseId,status,conclusion,url,jobs
gh run view <run-id> --log-failed

If it is a genuine CI failure:

  1. Fix the underlying issue locally, using the pr-ready workflow when helpful.
  2. Run the targeted local checks, plus broader checks when the change has broad impact.
  3. Commit and push the fix.
  4. Start the loop from the top.

If it is a CI flake:

  1. Use the flake skill in this monorepo.
  2. Rerun the failed flaky job or failed jobs as directed by that skill.
  3. Start the loop from the top.

Reviews

No reviews yet. Tell others what you thought.

Comments

No login needed. Share how it worked for you, ask a question, or note where it did not run.

No comments yet. Be the first to write one.

Comments are published right away. Do not include personal information such as email addresses or phone numbers. Up to 2 URLs.

0 / 1,000 characters

This form is protected by reCAPTCHA, and the Google Privacy Policy and Terms of Service apply.

More skills from this repository

add-bug

FreeSummary

Add a reported Remotion bug to the bugs API with its affected versions, a short title, and upgrade guidance. Follow the existing entry format and place the new record first so recent bugs appear at the top.

  • Adding a reported bug to the Remotion bugs API
  • Recording which versions a bug affects
  • Including upgrade guidance in a bug description
remotion-dev/remotion65.1KUpdated Oct 18, 2026

add-cli-option

FreeSummary

Add a Remotion command-line or configuration option, or convert a hardcoded flag into a shared option definition. Connect parsing, configuration setters, help entries, and generated documentation so the option is consistently available and documented.

  • Add a new Remotion command-line flag
  • Convert a hardcoded flag into a shared option
  • Connect an option to Config setters
remotion-dev/remotion65.1KUpdated Oct 18, 2026

add-effect

FreeSummary

Add a new effect to @remotion/effects, including its implementation, package entry points, documentation, interactive demo, and preview images. Follow the package conventions and verify the changes with tests, formatting checks, and builds.

  • Implementing a new effect for @remotion/effects
  • Registering effect imports and parameter types
  • Creating documentation and an interactive effect demo
remotion-dev/remotion65.1KUpdated Oct 18, 2026

add-expert

FreeSummary

Add a person to the Remotion experts page by placing their portrait, entering their profile and contact links, and generating an expert card image. The instructions specify file locations, profile fields, and how to verify card generation.

  • Add a new person to the Remotion experts page
  • Register a portrait, specialties, and contact links
  • Generate an expert card image
remotion-dev/remotion65.1KUpdated Oct 18, 2026

add-new-package

FreeSummary

Create a new @remotion package within the Remotion monorepo, a repository containing multiple packages. Set up its files, register it across the project, and prepare documentation, usage examples, and build configuration.

  • Creating a new @remotion package
  • Registering a package across the monorepo
  • Adding documentation and usage examples
remotion-dev/remotion65.1KUpdated Oct 18, 2026

add-sfx

FreeSummary

Add a new sound effect to @remotion/sfx, from registering the audio file to exporting its URL and documenting its use. The workflow covers playback examples, attribution, navigation entries, waveform generation, and the package build.

  • Add a sound effect to @remotion/sfx
  • Create documentation with playback and usage examples
  • Update sound effect navigation and waveform data
remotion-dev/remotion65.1KUpdated Oct 18, 2026

See all skills by remotion-dev

Report a problem with this skill