chore: sync the release branch with dev - #102
Open
phmatray wants to merge 23 commits into
Open
Conversation
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…trategy Introduces commercial licensing tiers for proprietary/fintech use cases: - Developer (€299/yr), Professional (€999/yr), Enterprise (€3,999+/yr) - FAQ addressing GPL-3.0 implications for commercial users - Placeholder section for upcoming Cloud API offering - Custom consulting/indicator development offering Addresses Sprint 1 pricing strategy (issue #7) and supports the v1.0 enterprise launch roadmap (issue #63).
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…age to 18.8.0 (#88) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…age to 18.9.0 (#95) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Brings the release branch up to date with dev (22 commits). main had diverged by 3 commits carrying the inline Renovate configuration from #76. dev superseded that in 632c3d2 by extending the shared phmatray/.github:renovate-ci preset, so the conflict in renovate.json is resolved in favour of dev and the resulting tree is byte-identical to dev. Refs #63
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.
Why
mainhad diverged fromdev: 3 commits ahead, 22 behind.The 3 exclusive commits were #76 (
chore: standardize renovate config), which added a long inlinerenovate.json.devsuperseded that in632c3d2eby extending the sharedlocal>phmatray/.github:renovate-cipreset — so main's exclusive content is obsolete, not lost work.Everything else on
mainwas simply older (global.json10.0.103 vs 10.0.201,actions/checkoutv6.0.2 vs v6.1.0).What this does
Merges
devintomain. The single conflict (renovate.json) is resolved in favour ofdev, and theresulting tree is byte-identical to
dev:Both parents are preserved, so #76 stays in the history rather than being force-pushed away
(
mainis protected against force pushes anyway).Pushing to
maintriggers the release job in.github/workflows/ci-cd.yml, which tags and publishes.maincurrently describes asv3.0.0. Merge this when you are ready for that to happen.Related cleanup
While auditing the remotes:
(
features/dotnet8,chore/standardize-renovate-config,feature/upgrade-dotnet-10-lts,WIP-local-backup-20260218).WIP-feature-backup-20260218andWIP-feature-backup-20260218-v2(agent-tooling debris; the one usefulhunk, a set of
.gitignoreentries, was carried over on the 🎯 Launch v1.0 - Enterprise Technical Analysis Library #63 branch).features/dotnet6(last commit 2021-11-14), after archiving it as the tagarchive/features-dotnet6so its 22 commits stay reachable. The tag is not
v-prefixed, so MinVer ignores it.auto-claude/001-high-level-api-for-common-use-caseswas kept — it holds ~1,400 lines of unmerged fluent-API work.All 7 release tags remain reachable from
dev; nothing deleted stranded a release.🤖 Generated with Claude Code