merge

Name: merge
Author: remotion-dev

54kstars3.9kforks

How to install merge?

remotion-dev/remotion/merge

$npx -y skills add remotion-dev/remotion --skill merge

Installs into the current project.

Summary

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 t

Files · 1

View on GitHub

SKILL.md

1	# /merge
2
3	Use this skill for an existing pull request in the Remotion monorepo.
4
5	## Loop
6
7	Start from the top after every pushed fix, conflict resolution, CI rerun, or other state change:
8
9	1. Identify the PR:
10
11	```bash
12	gh pr view --json number,url,state,isDraft,baseRefName,headRefName,mergeable,mergeStateStatus,reviewDecision,statusCheckRollup
13	```
14
15	2. 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.
16
17	3. If GitHub reports merge conflicts, resolve them using the [`pr-ready`](../pr-ready/SKILL.md) workflow. Commit and push the resolution when needed, then start this loop from the top.
18
19	4. Wait for checks:
20
21	```bash
22	gh pr checks --watch --interval 30
23	```
24
25	5. If all required checks pass and the PR is mergeable, merge it:
26
27	```bash
28	gh pr merge --squash --delete-branch
29	```
30
31	If the repository or PR clearly requires another merge method, use that method instead.
32
33	## CI Failures
34
35	When checks fail, inspect the failed jobs and logs before deciding what to do:
36
37	```bash
38	gh pr checks --watch=false
39	gh run view <run-id> --json databaseId,status,conclusion,url,jobs
40	gh run view <run-id> --log-failed
41	```
42
43	If it is a genuine CI failure:
44
45	1. Fix the underlying issue locally, using the [`pr-ready`](../pr-ready/SKILL.md) workflow when helpful.
46	2. Run the targeted local checks, plus broader checks when the change has broad impact.
47	3. Commit and push the fix.
48	4. Start the loop from the top.
49
50	If it is a CI flake:
51
52	1. Use the [`flake`](../flake/SKILL.md) skill in this monorepo.
53	2. Rerun the failed flaky job or failed jobs as directed by that skill.
54	3. Start the loop from the top.

People who liked this also viewed

6 picks

Type

merge

54kstars3.9kforks

View on GitHub

How to install merge?

remotion-dev/remotion/merge

$npx -y skills add remotion-dev/remotion --skill merge

Installs into the current project.

Summary

Files · 1

View on GitHub

SKILL.md

1	# /merge
2
3	Use this skill for an existing pull request in the Remotion monorepo.
4
5	## Loop
6
7	Start from the top after every pushed fix, conflict resolution, CI rerun, or other state change:
8
9	1. Identify the PR:
10
11	```bash
12	gh pr view --json number,url,state,isDraft,baseRefName,headRefName,mergeable,mergeStateStatus,reviewDecision,statusCheckRollup
13	```
14
15	2. 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.
16
17	3. If GitHub reports merge conflicts, resolve them using the [`pr-ready`](../pr-ready/SKILL.md) workflow. Commit and push the resolution when needed, then start this loop from the top.
18
19	4. Wait for checks:
20
21	```bash
22	gh pr checks --watch --interval 30
23	```
24
25	5. If all required checks pass and the PR is mergeable, merge it:
26
27	```bash
28	gh pr merge --squash --delete-branch
29	```
30
31	If the repository or PR clearly requires another merge method, use that method instead.
32
33	## CI Failures
34
35	When checks fail, inspect the failed jobs and logs before deciding what to do:
36
37	```bash
38	gh pr checks --watch=false
39	gh run view <run-id> --json databaseId,status,conclusion,url,jobs
40	gh run view <run-id> --log-failed
41	```
42
43	If it is a genuine CI failure:
44
45	1. Fix the underlying issue locally, using the [`pr-ready`](../pr-ready/SKILL.md) workflow when helpful.
46	2. Run the targeted local checks, plus broader checks when the change has broad impact.
47	3. Commit and push the fix.
48	4. Start the loop from the top.
49
50	If it is a CI flake:
51
52	1. Use the [`flake`](../flake/SKILL.md) skill in this monorepo.
53	2. Rerun the failed flaky job or failed jobs as directed by that skill.
54	3. Start the loop from the top.

People who liked this also viewed

6 picks

Type