Skip to content

Conversation

@mansona
Copy link
Member

@mansona mansona commented Oct 15, 2025

No description provided.

mansona and others added 23 commits September 10, 2025 22:28
This is just adding more notes from the most recent release, making sure to add more to the docs
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Document need for future vite experiment test cleanup
Merge beta into master and start 6.9 alpha
# Conflicts:
#	.release-plan.json
#	CHANGELOG.md
#	package.json
#	packages/addon-blueprint/package.json
#	packages/app-blueprint/files/package.json
#	packages/app-blueprint/package.json
#	pnpm-lock.yaml
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Promote Beta and update all dependencies for 6.8 release
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
@mansona mansona changed the base branch from master to beta October 15, 2025 15:40
@mansona mansona force-pushed the merge-release branch 3 times, most recently from b6fbdf2 to f32e2ee Compare October 15, 2025 15:47
# Conflicts:
#	.release-plan.json
#	CHANGELOG.md
#	package.json
#	packages/addon-blueprint/package.json
#	packages/app-blueprint/files/package.json
#	packages/app-blueprint/package.json
#	packages/blueprint-blueprint/package.json
#	packages/blueprint-model/package.json
#	packages/blueprint-model/utilities/experiments.js
#	pnpm-lock.yaml
#	tests/fixtures/addon/defaults/package.json
#	tests/fixtures/addon/pnpm/package.json
#	tests/fixtures/addon/typescript/package.json
#	tests/fixtures/addon/yarn/package.json
#	tests/fixtures/app/defaults/package.json
#	tests/fixtures/app/embroider-no-ember-data/package.json
#	tests/fixtures/app/embroider-no-welcome/package.json
#	tests/fixtures/app/embroider-pnpm/package.json
#	tests/fixtures/app/embroider-yarn/package.json
#	tests/fixtures/app/embroider/package.json
#	tests/fixtures/app/no-ember-data/package.json
#	tests/fixtures/app/npm/package.json
#	tests/fixtures/app/pnpm/package.json
#	tests/fixtures/app/typescript-embroider-no-ember-data/package.json
#	tests/fixtures/app/typescript-embroider/package.json
#	tests/fixtures/app/typescript-no-ember-data/package.json
#	tests/fixtures/app/typescript/package.json
#	tests/fixtures/app/yarn/package.json
@mansona mansona requested a review from a team October 15, 2025 16:02
@mansona mansona merged commit b0087c2 into beta Oct 15, 2025
70 checks passed
@mansona mansona deleted the merge-release branch October 15, 2025 16:15
@mansona mansona mentioned this pull request Oct 15, 2025
@mansona mansona mentioned this pull request Dec 10, 2025
@mansona mansona added the ignore label Dec 10, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants