fix(ci): use merge method in back-merge to preserve history#108
Merged
Conversation
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
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.
Summary
--squashwith--mergein the back-merge workflow'sgh pr mergecalls (lines 95-96).Why
Squash flattens the merge commit, breaking ancestry of main's commits in develop.
This was identified via marketplace PR #210 (squash) vs #211 (merge) — only the latter properly aligned the history.
The
develop protectionruleset allows bothsquashandmerge, so--mergeis already permitted.Impact
Future automated back-merges from main → develop will preserve full git history.
No functional change to release process.