opencode-skills-collection 1.0.148 → 1.0.149
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
# Merge Batch
|
|
2
|
+
|
|
3
|
+
`merge:batch` is the maintainer shortcut for merging multiple PRs in order while keeping the GitHub-only squash rule and the post-merge contributor sync.
|
|
4
|
+
|
|
5
|
+
## Prerequisites
|
|
6
|
+
|
|
7
|
+
- Start from a clean `main`.
|
|
8
|
+
- Make sure [`.github/MAINTENANCE.md`](/Users/nicco/Projects/antigravity-awesome-skills/.github/MAINTENANCE.md) is the governing policy.
|
|
9
|
+
- Have `gh` authenticated with maintainer permissions.
|
|
10
|
+
- Use this only for PRs that are already expected to merge; conflicting PRs still need the manual conflict playbook.
|
|
11
|
+
|
|
12
|
+
## Basic Usage
|
|
13
|
+
|
|
14
|
+
```bash
|
|
15
|
+
npm run merge:batch -- --prs 450,449,446,451
|
|
16
|
+
```
|
|
17
|
+
|
|
18
|
+
Add `--poll-seconds <n>` if you want a slower or faster status loop while checks settle.
|
|
19
|
+
|
|
20
|
+
## Happy Path
|
|
21
|
+
|
|
22
|
+
`merge:batch` will:
|
|
23
|
+
|
|
24
|
+
- refresh the PR body when the Quality Bar checklist is missing
|
|
25
|
+
- close and reopen the PR if stale metadata needs a fresh `pull_request` event
|
|
26
|
+
- approve fork runs waiting on `action_required`
|
|
27
|
+
- wait for the fresh required checks on the current head SHA
|
|
28
|
+
- merge with GitHub squash merge
|
|
29
|
+
- pull `main`, run `sync:contributors`, and push a README-only follow-up if needed
|
|
30
|
+
|
|
31
|
+
## What It Automates
|
|
32
|
+
|
|
33
|
+
- PR body normalization against the repository template
|
|
34
|
+
- stale PR metadata refresh
|
|
35
|
+
- required-check polling for the current PR head
|
|
36
|
+
- the post-merge contributor sync step
|
|
37
|
+
- the retry loop for `Base branch was modified`
|
|
38
|
+
|
|
39
|
+
## What It Does Not Automate
|
|
40
|
+
|
|
41
|
+
- conflict resolution on the PR branch
|
|
42
|
+
- manual judgment for risky skill changes
|
|
43
|
+
- README community-source audits when the source metadata is ambiguous
|
|
44
|
+
- fork-only edge cases that require contributor coordination outside GitHub permissions
|
|
45
|
+
|
|
46
|
+
## When To Stop
|
|
47
|
+
|
|
48
|
+
Stop and switch to the manual playbook when:
|
|
49
|
+
|
|
50
|
+
- the PR is `CONFLICTING`
|
|
51
|
+
- `merge:batch` reports a check failure that needs source changes, not maintainer automation
|
|
52
|
+
- the PR needs a manual README credits decision
|
|
53
|
+
- fork approval or branch permissions are missing
|
|
54
|
+
|
|
55
|
+
In those cases, follow [Merging Pull Requests](/Users/nicco/Projects/antigravity-awesome-skills/docs/maintainers/merging-prs.md) and the relevant sections in [MAINTENANCE.md](/Users/nicco/Projects/antigravity-awesome-skills/.github/MAINTENANCE.md).
|
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
- Do **not** integrate a PR by squashing locally, pushing to `main`, and then closing the PR. That would show "Closed" and the contributor would not get proper credit.
|
|
10
10
|
- Before merging, require the normal PR checks from [`.github/workflows/ci.yml`](../../.github/workflows/ci.yml) to be green. If the PR touches `SKILL.md`, also require the separate [`skill-review` workflow](../../.github/workflows/skill-review.yml) to pass.
|
|
11
11
|
- For PRs that touch `SKILL.md` or risky guidance, require a real manual logic review in addition to the automated checks. Confirm the instructions, failure modes, and `risk:` label make sense before merging.
|
|
12
|
+
- For ordered multi-PR maintainer batches, use [Merge Batch](merge-batch.md) as the operational shortcut and keep this document as the policy reference.
|
|
12
13
|
|
|
13
14
|
## If the PR has merge conflicts
|
|
14
15
|
|
|
@@ -77,5 +78,6 @@ Only if merging via GitHub is not possible (e.g. contributor unreachable and you
|
|
|
77
78
|
|
|
78
79
|
## References
|
|
79
80
|
|
|
81
|
+
- [Merge Batch](merge-batch.md)
|
|
80
82
|
- [GitHub: Creating a commit with multiple authors](https://docs.github.com/en/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors)
|
|
81
83
|
- [GitHub: Merging a PR](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request)
|
package/package.json
CHANGED