chore: merge main into develop so the release can fast-forward - #757
Merged
Conversation
Release: develop → main
Release: develop → main (v2.15.2)
docs: cut changelog for v2.15.2
Release: develop -> main (v2.15.3)
docs: cut changelog for v2.15.3
…-develop # Conflicts: # CHANGELOG.md
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.
Follow-up to #756, which fixed the changelog content but was squash-merged — so the merge relationship between the branches was discarded and
develop → mainstill conflicts on the same region.This is a real merge commit with both parents (
703a84ddevelop,d25bba6main). The file diff againstdevelopis empty: #756 already reconciled the content, so the only thing this adds is the history join that lets git see the branches as related.Merge this with a merge commit, not a squash — squashing it would throw away the parent link again and leave #755 conflicting exactly as before.
Verified: nothing
mainhad in CHANGELOG.md is missing from the result.https://claude.ai/code/session_01Nah4N2sGFs1TU2t7DXfKzJ