Skip to content

merge: reconcile Gitea main with GitHub main - #4

Merged
roethlar merged 5 commits into
mainfrom
reconcile/gitea-main
Oct 24, 2026
Merged

roethlar merged 5 commits into
mainfrom
reconcile/gitea-main

Conversation

@roethlar

Copy link
Copy Markdown
Owner

CI gate for reconciling the diverged main branches. Once green, main on both remotes is fast-forwarded to this merge commit; this PR is not merged through GitHub.

  • Gitea-only: d54350b state sweep, d2e0be3 unsupported-keyboard surfacing, 29b7ed4 intake-plan close.
  • GitHub-only: 02194cf LF pinning for Linux packaging sources, 72cf2e3 its green-CI record.
  • .agents/state.md (the only file changed on both sides) keeps the Gitea sweep as base with the Windows CI repair entry restored unchanged.

This is the first CI run over d2e0be3.

🤖 Generated with Claude Code

roethlar and others added 5 commits August 22, 2026 18:03
Joins the Gitea-only line (d54350b state sweep, d2e0be3 unsupported-keyboard
surfacing, 29b7ed4 intake-plan close) with the GitHub-only line (02194cf LF
pinning for Linux packaging sources, 72cf2e3 its green-CI record).

.agents/state.md was the only file changed on both sides. Resolved by
keeping the Gitea sweep's Now/Next/Blockers as the base and restoring the
Windows CI repair entry unchanged at the top of Now.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
State: the b699548 merge passed CI and the desktop installer builds on
PR #4, the first CI run over d2e0be3. Machines: netwatch-01 now runs
Windows Server 2025 without uv, Node, or the F:\dev junction, so the
recorded verification entry point cannot run there.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@roethlar
roethlar merged commit f837e1c into main Oct 24, 2026
11 checks passed
@roethlar
roethlar deleted the reconcile/gitea-main branch October 24, 2026 05:43
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.

1 participant