$npx -y skills add remotion-dev/remotion --skill pr-readyResolve CI failures, merge conflicts, or local branch changes to get a PR ready
| 1 | Use this skill when a pull request is not ready because there is either: |
| 2 | |
| 3 | - a CI failure |
| 4 | - a merge conflict |
| 5 | - uncommitted or unpushed changes |
| 6 | |
| 7 | Bring the pull request back to a ready state. |
| 8 | |
| 9 | Start by checking: |
| 10 | |
| 11 | 1. The current git branch and working tree state with `git status`. |
| 12 | 2. Whether the local branch has commits that are not pushed yet. |
| 13 | 3. Whether the PR branch has merge conflicts with the base branch. |
| 14 | 4. The current PR checks or CI failures using the `gh` CLI. |
| 15 | |
| 16 | If there are uncommitted changes, untracked files that look relevant, or commits that have not been pushed, stop before changing, committing, or pushing them and ask the user for confirmation. |
| 17 | |
| 18 | If there is a merge conflict: |
| 19 | |
| 20 | 1. Update the local base branch reference. |
| 21 | 2. Rebase or merge the PR branch onto the base branch, following the repository's existing workflow. |
| 22 | 3. Resolve conflicts carefully and preserve both the PR intent and upstream changes. |
| 23 | 4. Run the relevant formatting, tests, or builds for the affected packages. |
| 24 | 5. Ask the user for confirmation before pushing if the conflict resolution creates unpushed commits. |
| 25 | |
| 26 | If there is a CI failure: |
| 27 | |
| 28 | 1. Inspect the failing check logs with the `gh` CLI. |
| 29 | 2. Fix the underlying cause instead of retrying or bypassing the failure. |
| 30 | 3. Run the relevant local checks that cover the failure. |
| 31 | 4. Commit the fix if needed. |
| 32 | 5. Ask the user for confirmation before pushing if this creates unpushed commits. |
| 33 | |
| 34 | If there are no CI failures, no merge conflicts, and no uncommitted or unpushed changes, report that the PR is already ready. |