You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Commit 3fe9083
Browse filesBrowse the repository at this point in the historyBrowse files
Copy file name to clipboardExpand all lines: .agents/skills/merge-renovate-prs/SKILL.md
+41Lines changed: 41 additions & 0 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -140,8 +140,49 @@ gh run view <RUN_ID> --log-failed
140
140
141
141
Summarize each failure in 1โ3 lines. If a failure looks like rate limiting / a transient external dependant (timeouts, 429s, network resets) rather than a code regression, say so and suggest re-running the skill once limits reset.
142
142
143
+
## Rebasing a stale renovate PR onto the base branch
144
+
145
+
When a PR's `mergeStateStatus` is `DIRTY` (conflicts) or it's simply behind `chore/renovateBaseBranch`, it needs a rebase before it can go green/merge. **Do NOT** naively `git rebase origin/chore/renovateBaseBranch` and replay every commit on the branch.
146
+
147
+
Why: Renovate periodically **recreates**`chore/renovateBaseBranch` from `main`, so the base already contains newer-or-equal versions of most bumps the PR branch still carries. The PR branch's older bump commits are stale/superseded (e.g. the base has `@types/node` v26.0.1 while the PR still carries a commit setting it to v26). Replaying them all would try to *downgrade* those deps and manufacture needless `yarn.lock`/`package.json` conflicts.
148
+
149
+
Correct approach โ replay **only the PR's own unique commits** with `git rebase --onto` (this mirrors what Renovate's own "rebase" checkbox does), in a **detached throwaway worktree** so the current branch/working tree is untouched:
Identify the commits genuinely unique to this PR โ its own dependency bump plus any follow-up (e.g. a "format" commit). Everything below the first unique commit is stale and already on the base in newer form, so drop it. Then:
# <first-unique-commit>^ is the boundary between stale (drop) and unique (keep)
164
+
git rebase --onto origin/chore/renovateBaseBranch <first-unique-commit>^
165
+
```
166
+
167
+
- If the replay is clean (usual case), verify `git diff --stat origin/chore/renovateBaseBranch..HEAD` shows **only** the PR's own changes, and that `package.json` and `yarn.lock` reference the same bumped version.
168
+
- If a `yarn.lock`/`package.json` conflict appears, resolve per the lockfile rule: take the base's lockfile, keep the PR's version bump in `package.json`, then regenerate the lock (never hand-edit it).
Merge state should flip `DIRTY` โ `UNSTABLE` (conflict resolved, CI running) and a fresh `Checks` run triggers on the new head. This rebase (rewriting a renovate branch's history + force-push) is authorized only when the user explicitly asks to rebase โ it's the one exception to "never push to a renovate branch."
178
+
179
+
Gotcha: never `git worktree remove` the directory you're currently `cd`'d into โ deleting the shell's cwd wedges the session. `cd` out first.
180
+
143
181
## Notes
144
182
183
+
-**Don't block on the base branch CI or the rebase "storm."** Each merge into `chore/renovateBaseBranch` advances it, which makes Renovate auto-rebase every other open `renovate/*` PR (cancelling their in-flight runs and starting fresh ones) and triggers a run on the base-branchโ`main` PR. Do **not** wait for those base-branch runs or for the whole storm to drain. Stay focused on the target PRs: keep retrying their own `check.yml` runs and **merge each the moment its own checks are green**, regardless of what the base branch or other PRs are doing.
184
+
- Merges advancing the base will cancel/supersede reruns you started on the other targets โ that's expected. Just re-check each target, rerun its failed/cancelled jobs, and merge when green; iterate until the batch is done rather than serializing behind base-branch CI.
145
185
- Renovate PRs in this repo target the `chore/renovateBaseBranch` base, not `main` โ `gh pr merge` targets each PR's own base automatically, so no special handling is needed.
146
186
- Keep CI load low: rerun only failed jobs, never the whole workflow, and never push commits to retrigger unless the user approves.
147
187
- Never edit generated client code to "fix" a Renovate failure โ these PRs only bump dependencies; a real failure should be surfaced, not patched.
188
+
-**Hold bumps that would force a customer-facing runtime bump.** If merging a bump requires raising a *published* client's minimum language/runtime, it's a breaking change for consumers โ close the PR with a short explanation instead of migrating (same policy as JUnit 6 โ JVM 17+, pytest-aiohttp โ Py 3.10+). Known case: **`renovate/melos-8.x`** (Dart) โ melos โฅ7 drops `melos.yaml` for Dart pub workspaces, which requires `resolution: workspace` on every package and raises the minimum Dart SDK to 3.5+ on all published packages. Keep the Dart client on **melos 6.x**. (Renovate may recreate a closed PR on its next run; to hold permanently, add the dep to the Renovate config's ignore list.)
Copy file name to clipboardExpand all lines: .agents/skills/renovate/SKILL.md
+1Lines changed: 1 addition & 0 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -147,6 +147,7 @@ If the PR only updates the `crossScalaVersions` 3.x entry or the 2.x `scalaVersi
147
147
Close (do not merge) PRs that update these packages, and add them to the "Abandoned" report list with a note:
148
148
149
149
-**Dart `json_serializable`**: Updating `json_serializable` requires updating `json_annotation`, which in turn requires bumping the minimum Dart SDK version. This is a breaking change for customers on older Dart versions. Close the PR.
150
+
-**Dart `melos` v8+**: melos โฅ7 drops `melos.yaml` in favor of Dart pub workspaces, which requires `resolution: workspace` on every package and therefore raises the minimum Dart SDK to 3.5+ on all published packages โ a breaking change for customers on older Dart versions. Keep the Dart client on melos 6.x. Close the PR.
150
151
-**`@redocly/cli` beyond v2.27.0**: v2.27.1 introduces breaking changes (renaming components) that break our spec bundling. Pinned at v2.27.0 for now. Close the PR.
151
152
-**Python runtime โฅ 3.14**: The release toolchain for PyPI (poetry/twine) is not compatible with Python 3.14+. The `python-version` in `clients/algoliasearch-client-python/.github/workflows/release.yml` must stay on the 3.13.x line. If a PR bumps it to 3.14 or above, revert to the latest 3.13.x patch and close the PR.
0 commit comments