Skip to content

chore: merge main into campaign/integration - #18

Merged
Upd4ting merged 3 commits into
campaign/integrationfrom
chore/merge-main-2026-11-03
Nov 2, 2026
Merged

Upd4ting merged 3 commits into
campaign/integrationfrom
chore/merge-main-2026-11-03

Conversation

@Upd4ting

@Upd4ting Upd4ting commented Nov 2, 2026

Copy link
Copy Markdown
Member

Why

Antony's joint release needs every campaign/integration branch to be 0 behind its default branch (release rehearsal 2026-11-02, blocker 1). This PR merges main into a branch cut from campaign/integration. Nothing is pushed to main.

What changed

Merges main at bc0ce2d into campaign/integration at b6645bd. Commits from main brought in:

Releases merged in: none.

Conflicts

None. git merge applied every file without a conflict.

Proofs

  • GITHUB_BASE_REF=campaign/integration pnpm run checks on head 95538a4: exit 0. Last lines of the run:
> @antelopejs/interface-subscriptions@0.1.0 checks /home/antony/.cache/campaign/h8/work/merge-main/interface-subscriptions/interface-subscriptions
> antelopejs-checks
Checks: 8 passed, 0 failed.
  • The merge commit went through the repository's pre-commit hooks.
  • CI: the checks on this PR.

Attention

  • Root manifest version: integration 0.1.0, main 0.1.0, this head 0.1.0. Versions come in from main as they are; this PR sets none.

@Upd4ting
Upd4ting marked this pull request as ready for review November 2, 2026 23:35
@Upd4ting
Upd4ting merged commit f4d7e5f into campaign/integration Nov 2, 2026
7 checks passed
@Upd4ting
Upd4ting deleted the chore/merge-main-2026-11-03 branch November 2, 2026 23:35
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