fix: merge master into develop (real merge, not squash)#13
Merged
Conversation
* fix: deploy demo with GitHub Pages workflow * ci: enable npm provenance (#3)
Real merge commit (not squash) so git recognizes master's history is incorporated into develop. Previous squash merges (#11, #12) lost the parent link, causing GitHub to still see conflicts. Kept develop's advanced demo/index.html with all new features. Co-Authored-By: Claude Opus 4.6 (1M context) <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
masterintodevelop(not squash)demo/index.htmlconflict persisteddevelop -> masterwill be conflict-freeImportant
This PR must be merged with "Create a merge commit" — NOT "Squash and merge".
Squash will lose the parent link again and the conflict will return.
Test plan
develop -> masterPR — should have zero conflicts