Menu
Skill for resolving .lycheecache merge or rebase conflicts in the current branch or a specified PR.
Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.
Based on SOC occupation classification
Fetch, review, and attempt to fix failing link-check URLs on otelbot PRs. By default, sweeps all open `otelbot/*` PRs and processes those with failing link checks; targets a specific branch or group of branches when so instructed. Use when a bot branch is red, the link check keeps reporting 4XX/fragment errors after retries, or you want a guided pass over the refcache fix loop.
Review pull requests for opentelemetry.io: CI check semantics, CLA and approval-label workflow, refcache handling, locale rules, and content quality. Use when reviewing a PR or debugging a CI failure in open-telemetry/opentelemetry.io.
Set up a new website localization (language) for opentelemetry.io. Use when adding a new language/locale, wiring a new `content/<lang>/` tree, or onboarding a localization team.
Draft GitHub issues for opentelemetry.io following the real issue templates under `.github/ISSUE_TEMPLATE/`, the contributing guide, and the repo's live label taxonomy. Use when creating issue drafts from investigation findings or conversation context.
Verify that an otelbot "Auto-update registry versions" PR is a pure version bump, then on confirmation, approve and add it to the merge queue. Use for otelbot/auto-update-registry-* PRs in open-telemetry/opentelemetry.io.
Review OpenTelemetry blog posts for front matter compliance, content conventions, GitHub link stability (`gh-url-hash`), spelling, and OTel terminology. Use when reviewing a PR or draft under `content/en/blog/`.
| name | resolve-refcache-conflicts |
| description | Skill for resolving .lycheecache merge or rebase conflicts in the current branch or a specified PR. |
| argument-hint | [optional-pr-number] |
.lycheecache is an auto-generated file. Resolving conflicts requires first
taking the integration branch's side, finishing the merge/rebase, then running
npm run fix:refcache to restore any URLs unique to the active branch.
If the current branch has a merge or rebase in progress, then skip the rest of this section and jump to Preparation.
The current branch must be clean (git status --short). If not clean, offer to
run git stash or git commit to clean it up, or stop.
If $ARGUMENTS is a PR number, then check out the PR branch with:
gh pr checkout $ARGUMENTS.
At this point, we are ready to resolve the conflicts in the active branch:
Determine the integration reference ($BASE_BRANCH) and fetch it:
upstream remote exists: git fetch upstream, use upstream/main.git fetch origin, use origin/main.If merge or rebase is in progress (git status), skip this step. Otherwise,
ask the user whether to run git merge $BASE_BRANCH or
git rebase $BASE_BRANCH, then run it.
If there are no conflicts: stop, we are done.
Conflicts other than .lycheecache: resolve them with the user.
If no .lycheecache conflict remains: stop, we are done. Otherwise, proceed
to Resolve.
Check out the $BASE_BRANCH version of .lycheecache. Assumes the active
branch is being rebased/merged from $BASE_BRANCH, not the other way around:
| Operation | Command |
|---|---|
Rebase of active branch onto $BASE_BRANCH | git checkout --ours .lycheecache |
Merge of $BASE_BRANCH into active branch | git checkout --theirs .lycheecache |
Stage the resolved files, then continue:
git add .lycheecache && git rebase --continuegit add .lycheecache && git commit --no-editgit add those too
before continuing.Rebase only: for each subsequent rebase stop that conflicts on
.lycheecache, repeat Resolve steps 1–2. If other paths are also conflicted
on that stop, run Preparation step 4 first.
Run npm run fix:refcache once, after the entire rebase/merge completes.
Note: this runs a Hugo build (lean by default) and link check — requires
network, installed npm dependencies, and populated submodules; can take
several minutes.
Commit the changes, if any:
git add .lycheecache
git diff --cached --quiet .lycheecache || \
git commit -m "Refresh refcache after resolving conflicts"
Push:
git pushgit push --force-with-lease