Skip to content

chore: merge main into develop (heal gitflow ancestry) - #112

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

chore: merge main into develop (heal gitflow ancestry)#112
MarTrepodi merged 2 commits into
developfrom
chore/merge-main-into-develop-2

Conversation

@MarTrepodi

Copy link
Copy Markdown
Collaborator

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.

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
MarTrepodi merged commit fc1318d into develop Jul 12, 2026
15 checks passed
@MarTrepodi
MarTrepodi deleted the chore/merge-main-into-develop-2 branch July 12, 2026 01:34
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