Repository navigation
fix: merge main's release history into dev - #1377
Merged
Merged
Conversation
…ain--components--aptl chore(main): release 4.0.1
…ain--components--aptl chore(main): release 4.1.0
…ain--components--aptl chore(main): release 4.1.1
…ain--components--aptl chore(main): release 4.1.2
…ain--components--aptl chore(main): release 4.2.0
fix(release): document release-please title parsing
…ain--components--aptl chore(main): release 4.2.1
…ain--components--aptl chore(main): release 4.2.2
…ain--components--aptl chore(main): release 5.0.0
…ain--components--aptl chore(main): release 5.1.0
…ain--components--aptl chore(main): release 5.1.1
…ain--components--aptl chore(main): release 5.2.0
…ain--components--aptl chore(main): release 5.3.0
…main--components--aptl chore(main): release 5.3.1
…main--components--aptl chore(main): release 5.4.0
…main--components--aptl chore(main): release 5.5.0
…main--components--aptl chore(main): release 5.6.0
…main--components--aptl chore(main): release 6.0.0
chore: promote dev to main
…-components--aptl chore(main): release 7.0.0
# Conflicts: # pyproject.toml # uv.lock
9 tasks done
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.
Summary
Merge this PR with "Create a merge commit". Do not squash it. The merge parent is the fix.
#1376 delivered the docs, but the
merge-policy-devruleset allowed only squash, so its merge commit was flattened andmainis still not indev's history. The dev → main promotion #1374 therefore still conflicts inpyproject.tomlanduv.lock. The ruleset now allows merge commits ondev(feature PRs can still be squash-merged). This PR is the single merge commit929c7382, with parentsdev(78a1864e) andmain(9aadab58, the 7.0.0 release). Its tree is identical todev; it changes history only.Requirement UIDs
Related Issues
Closes #1375
ADR Impact
Changes
929c7382. The conflicts resolve todev's side:name = "lilrae"withversion = "7.0.0", and the matchinguv.lockentry.uv lock --checkpasses,git diff origin/devis empty, andgit merge-base --is-ancestor origin/main HEADsucceeds.merge-policy-devallowsmergeandsquash. Before, it allowedsquashonly.Test Plan
The tree is byte-identical to
devat78a1864e, whose CI ran with #1376. There is no code change to test locally.Ground Control Checks
Traceability
Checklist
Documentation
Verified unchanged: the merge-commit rule was documented in #1376.