Point Dependabot at master and document the trunk-based release model - #89
Merged
Conversation
Development consolidated from 0.2.x onto master. Update Dependabot's target-branch to match, and add docs/RELEASING.md describing the model: master is the single trunk, releases are tags, maintenance branches are created reactively from a tag, and the BC check gates by intended version. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XaVJhFFYHJee3UokQwFG6E
MidnightDesign
added a commit
that referenced
this pull request
Jul 23, 2026
Brings in the trunk process docs (#89) and the BC policy + @internal hygiene (#90). Conflict resolution: - src/Parser/Delimiters.php: kept deleted. generics removes this class; #90 had added @internal to it on master. Keeping it deleted wins. - src/Parser/TypeParser.php: auto-merged. It now carries #90's @internal next to its @psalm-internal, alongside the generics changes. InternalAnnotationConsistencyTest (from #90) passes: every @psalm-internal source file also carries @internal. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01XaVJhFFYHJee3UokQwFG6E
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.
Follows the trunk consolidation (
0.2.xrenamed tomaster).dependabot.yml: retarget both ecosystems from0.2.xtomaster(the old branch no longer exists, so Dependabot would otherwise fail).docs/RELEASING.md: document the model —masteris the single trunk, releases are tags, maintenance branches are created reactively from a tag, and the BC check gates by intended version (informational per-PR, enforced at release).🤖 Generated with Claude Code