chore: merge main into develop (post-release sync) - #110
Merged
Conversation
## Description Update all workflows that use the `checkout` actions to v7 --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Collaborator
Author
Reviewer note — verification detailThis mergeback was produced against a task spec whose containment assertion was written in the wrong direction. Recording the correction here so the numbers below aren't misread as a failure:
Confirmed on this branch:
Net: conflict-free, zero file changes (checkout v7 already on develop via #103/#105), |
MarTrepodi
added a commit
that referenced
this pull request
Jul 12, 2026
Redo of #110, which rebase-merged to a no-op (merge commits were disabled at the time). Merge commits are now enabled. **Heals gitflow ancestry** so develop contains main's tip (`ddf3dc7`, #106). No file changes — checkout v7 is already present on develop via #103/#105.⚠️ **Merge this with "Create a merge commit"** (not rebase). Rebase strips the merge point and would no-op again, leaving ancestry unhealed.
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.
Heals gitflow ancestry so
developcontainsmain's tip. No file changes (checkout v7 already present on develop via #103/#105).