Skip to content

chore: merge main into develop (post-release sync) - #110

Merged
MarTrepodi merged 3 commits into
developfrom
chore/merge-main-into-develop
Jul 12, 2026
Merged

chore: merge main into develop (post-release sync)#110
MarTrepodi merged 3 commits into
developfrom
chore/merge-main-into-develop

Conversation

@MarTrepodi

Copy link
Copy Markdown
Collaborator

Heals gitflow ancestry so develop contains main's tip. No file changes (checkout v7 already present on develop via #103/#105).

MarTrepodi and others added 2 commits July 5, 2026 07:15
## 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>
@MarTrepodi

Copy link
Copy Markdown
Collaborator Author

Reviewer note — verification detail

This 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:

  • The spec asserted git rev-list --count origin/main..HEAD should be 0. That direction counts commits reachable from HEAD but not main — and develop legitimately has 15 such commits (it's ahead of main), so this correctly returns 15, not 0.
  • The meaningful "main fully contained" test is the reverse — git rev-list --count HEAD..origin/main — which returns 0.

Confirmed on this branch:

Check Result
git diff --stat origin/develop..HEAD (file changes vs develop) empty — 0 files
git rev-list --count HEAD..origin/main (main not contained) 0
Merge commit parents 45dce8a (develop tip) + ddf3dc7 (#106, main tip)

Net: conflict-free, zero file changes (checkout v7 already on develop via #103/#105), main fully absorbed.

@MarTrepodi
MarTrepodi merged commit ffd8ac0 into develop Jul 12, 2026
15 checks passed
@MarTrepodi
MarTrepodi deleted the chore/merge-main-into-develop branch July 12, 2026 01:26
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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant