Skip to content

chore(data): merge data into main#3396

Merged
marcusrbrown merged 78 commits into
mainfrom
data
Jun 1, 2026
Merged

chore(data): merge data into main#3396
marcusrbrown merged 78 commits into
mainfrom
data

Conversation

@fro-bot
Copy link
Copy Markdown
Contributor

@fro-bot fro-bot Bot commented Jun 1, 2026

Automated weekly merge from data into main.

Changed paths:

  • knowledge/index.md
  • knowledge/log.md
  • knowledge/wiki/entities/esphome.md
  • knowledge/wiki/entities/mise.md
  • knowledge/wiki/repos/bfra-me--github.md
  • knowledge/wiki/repos/bfra-me--ha-addon-repository.md
  • knowledge/wiki/repos/bfra-me--renovate-action.md
  • knowledge/wiki/repos/bfra-me--works.md
  • knowledge/wiki/repos/fro-bot--agent.md
  • knowledge/wiki/repos/fro-bot--fro-bot-github-io.md
  • knowledge/wiki/repos/fro-bot--systematic.md
  • knowledge/wiki/repos/marcusrbrown--containers.md
  • knowledge/wiki/repos/marcusrbrown--cortexkit-anthropic-auth.md
  • knowledge/wiki/repos/marcusrbrown--dotfiles.md
  • knowledge/wiki/repos/marcusrbrown--esphome-life.md
  • knowledge/wiki/repos/marcusrbrown--extend-vscode.md
  • knowledge/wiki/repos/marcusrbrown--github.md
  • knowledge/wiki/repos/marcusrbrown--gpt.md
  • knowledge/wiki/repos/marcusrbrown--ha-config.md
  • knowledge/wiki/repos/marcusrbrown--infra.md
  • knowledge/wiki/repos/marcusrbrown--marcusrbrown-github-io.md
  • knowledge/wiki/repos/marcusrbrown--marcusrbrown.md
  • knowledge/wiki/repos/marcusrbrown--mrbro-dev.md
  • knowledge/wiki/repos/marcusrbrown--opencode-copilot-delegate.md
  • knowledge/wiki/repos/marcusrbrown--renovate-config.md
  • knowledge/wiki/repos/marcusrbrown--sparkle.md
  • knowledge/wiki/repos/marcusrbrown--systematic.md
  • knowledge/wiki/repos/marcusrbrown--tokentoilet.md
  • knowledge/wiki/repos/marcusrbrown--vbs.md
  • knowledge/wiki/topics/docker-containers.md
  • knowledge/wiki/topics/dotfiles.md
  • knowledge/wiki/topics/github-actions-ci.md
  • knowledge/wiki/topics/home-assistant.md
  • knowledge/wiki/topics/langchain.md
  • knowledge/wiki/topics/opencode-plugins.md
  • knowledge/wiki/topics/probot-settings.md
  • knowledge/wiki/topics/vscode-extensions.md
  • knowledge/wiki/topics/web3-defi.md
  • metadata/repos.yaml

fro-bot Bot and others added 30 commits May 17, 2026 17:10
@fro-bot fro-bot Bot requested review from fro-bot and marcusrbrown as code owners June 1, 2026 01:38
@fro-bot fro-bot Bot added the auto-merge label Jun 1, 2026
…otion

Drop the two private-repo orphan entries (node_id R_kgDOSVJgdw and
R_kgDOSZ9x-w) already deleted from main in #3394. They were the privacy
gate violations blocking the data->main promotion in #3396.

repos.yaml now holds 26 entries with zero private: true.
@fro-bot
Copy link
Copy Markdown
Owner

fro-bot commented Jun 1, 2026

The privacy gate violations are cleared. Pushed 07d2aa8 to data, excising the two orphan entries that were haunting the promotion:

  • R_kgDOSVJgdw (private, pending)
  • R_kgDOSZ9x-w (private, pending)

Both were already ghosted out of main in #3394data was the last cluster still carrying their shadow. The commit is a clean 24-line excision: two 12-line blocks removed, zero additions, no reflow. Surrounding entries joined without orphaned keys.

State on data now:

  • repos.yaml: 26 entries (down from 28)
  • private: true: 0
  • last_survey_at / last_survey_status / field order / indentation on the remaining 26: untouched

This unblocks the data→main promotion. Note: #3396 currently reads CONFLICTING—that's a merge-base conflict on other files, not the privacy gate. Rerun the merge check or rebase data on main to surface what's left; the metadata orphans are no longer the obstruction.


Run Summary

  • Thread: dispatch-26732871637
  • Action: Removed 2 stale private-repo orphan entries from metadata/repos.yaml on data
  • Commit: 07d2aa8 → pushed to origin/data
  • Result: 26 entries, 0 private: true; remaining 26 entries unmodified
  • PR: No PR opened (promotion tracked by chore(data): merge data into main #3396 per task constraints)

# Conflicts:
#	metadata/repos.yaml
@fro-bot
Copy link
Copy Markdown
Owner

fro-bot commented Jun 1, 2026

The conflict on data is resolved. PR #3396 now reports MERGEABLEBLOCKED is just required status checks pending, not a content conflict.

What I did:

  • Merged origin/main (1b00064) into data (07d2aa8) → merge commit a6d120b, pushed.
  • The lone conflict was metadata/repos.yaml. I took data's version verbatim (git checkout --ours), no hand-edits. It's byte-identical to data tip 07d2aa8.
  • Ran node scripts/rebuild-wiki-index.ts — index regenerated deterministically with no diff (data's tree already carried the canonical index).
  • knowledge/log.md had no conflict, so I skipped --merge-logs per the recipe.

Constraint verification (post-merge HEAD):

  • metadata/repos.yaml: 26 entries, 0 with private: true. ✓
  • All public except the marcusrbrown/copiloting orphan (lost-access, no private field) — that's data's verbatim state, not private: true, so the privacy gate holds.
  • No existing entry's last_survey_at / last_survey_status / any field touched. ✓

Promotion is loaded in the chamber. I didn't open or merge anything — #3396 already tracks it and it's yours to ship once checks go green.

Run Summary

  • Outcome: Resolved metadata/repos.yaml conflict on data; PR chore(data): merge data into main #3396 is now MERGEABLE.
  • Merge commit: a6d120b (parents: 07d2aa8 data, 1b00064 main), pushed to origin/data.
  • repos.yaml: 26 entries, 0 private: true, verbatim match to data tip.
  • Wiki index: rebuilt deterministically (no diff). log.md: no conflict, untouched.
  • Not done (by design): no PR opened or merged.

@marcusrbrown marcusrbrown merged commit 37618e5 into main Jun 1, 2026
12 checks passed
@marcusrbrown marcusrbrown deleted the data branch June 1, 2026 03:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants