chore: sync dev with main after PR #3 (git-flow back-merge)#4
Merged
Conversation
ci: sync GitHub Actions versions on main (checkout v4→v7, setup-node v4→v6)
PR #3 landed the GitHub Actions version bumps on `main` via its own commits; `dev` already had the same bumps from Dependabot (#1, #2). Merging main back into dev reconciles the two histories (no file changes — trees are identical) so future dev->main release merges have a clean base. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
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
1 participant
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.
Summary
Git-flow back-merge: reconcile
devwithmainafter #3 merged.mainvia its own commits.devalready carried the same bumps from Dependabot (ci: Bump actions/checkout from 4 to 7 #1, ci: Bump actions/setup-node from 4 to 6 #2).So the file trees are already identical — this PR has no file changes.
It only brings
main's merge commits intodevso the two histories arereconciled and the next
dev → mainrelease merge has a clean base.Type of change
How was this tested?
git diff origin/devfor this branch is empty; CI (validate) runs on the PR.Checklist
main.js/styles.css/manifest.jsonchangedev(history-only merge)