Repository navigation
Merge master into release-3.1.0 - #515
Merged
jankapunkt merged 10 commits intoSep 14, 2026
Merged
jankapunkt merged 10 commits into
jankapunkt merged 10 commits into
Conversation
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.21 to 4.18.1. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](lodash/lodash@4.17.21...4.18.1) --- updated-dependencies: - dependency-name: lodash dependency-version: 4.18.1 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.1.2 to 3.1.5. - [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md) - [Commits](isaacs/minimatch@v3.1.2...v3.1.5) --- updated-dependencies: - dependency-name: minimatch dependency-version: 3.1.5 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 3.14.1 to 3.14.2. - [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md) - [Commits](nodeca/js-yaml@3.14.1...3.14.2) --- updated-dependencies: - dependency-name: js-yaml dependency-version: 3.14.2 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jan Küster <jkuester@uni-bremen.de>
Blaze 3.0.3
Resolves the conflicts listed in the meteor#492 checklist. All of them come from the 3.0.3 release on master: - package.js / .versions: kept the release-3.1.0 side; every master constraint is covered by an equal or newer 3.1.0-alpha one, and the jquery test dependency stays removed as done in meteor#497. - HISTORY.md: kept the v3.1.0-alpha.0 entry and carried the v3.0.3 one. - site/package-lock.json: kept the deletion from the VitePress migration (meteor#494).
Collaborator
|
@dupontbertrand is this correct that the PR does only contain a README file change or is the merge conflict implictly resolved by commit b4e04c3 |
Author
|
Both, yes. The conflicts are resolved inside the merge commit b4e04c3 itself. For the 32 conflicting What the merge commit really adds is history: once merged, |
jankapunkt
approved these changes
Sep 14, 2026
This was referenced Sep 14, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Resolves the
release-3.1.0↔masterconflicts from the #492 checklist, as agreed there.All 34 conflicts come from the 3.0.3 release on
master; no code differs:package.js/.versions(32 files): kept therelease-3.1.0side. Every constraint onmasteris covered by an equal or newer 3.1.0-alpha one, and thejquerytest dependency inspacebars-testsstays removed, as in Tests: jquery + native DOM backends #497.HISTORY.md: kept the v3.1.0-alpha.0 entry and carried the v3.0.3 entry below it, as-is frommaster(its date is still2026-XX-XXthere).site/package-lock.json: kept the deletion from the VitePress migration (docs: migrate to vitepress #494).Compared with
release-3.1.0, this branch only adds the 5-line v3.0.3 entry toHISTORY.md. Once merged, #492 no longer conflicts withmaster.