Resolve merge conflicts: regenerate lockfiles for semantic-release 25.0.3 bump#309
Merged
atherdon merged 2 commits intodependabot/npm_and_yarn/multi-1f44ea8135from Mar 18, 2026
Merged
Conversation
Co-authored-by: atherdon <1469198+atherdon@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Update semantic-release to version 25.0.3 and remove @tootallnate/once
Resolve merge conflicts: regenerate lockfiles for semantic-release 25.0.3 bump
Mar 18, 2026
atherdon
merged commit d0eef64
into
dependabot/npm_and_yarn/multi-1f44ea8135
1 check passed
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.
PR #304 (Dependabot bump of
semantic-release20.1.0 → 25.0.3 and removal of@tootallnate/once) had a dirty merge state due to lockfile conflicts withmain.Changes
package-lock.json— Regenerated vianpm install --package-lock-only --ignore-scriptsagainst the existingpackage.json(semantic-release: 25.0.3)yarn.lock— Existing file had an invalid format incompatible with yarn 1.x; deleted and regenerated viayarn import(derived from the updatedpackage-lock.json)Both lockfiles reflect
semantic-release@25.0.3and exclude@tootallnate/once.📱 Kick off Copilot coding agent tasks wherever you are with GitHub Mobile, available on iOS and Android.