Strengthen skill guidance on submodule merge sequence#3475
Merged
mattleibow merged 2 commits intomainfrom Jan 29, 2026
Merged
Conversation
Add explicit warning about squash-merge creating new commits and the danger of orphaned submodule references. Include mandatory merge sequence with exact commands to prevent this issue.
|
Triage Summary Labels will be applied specifically for documentation updates related to the merging process and submodule handling. This issue is not a regression as it pertains solely to documentation updates and does not involve any specific backend technologies or operational systems. Additional remarks:
Detailed Summary and ActionsSummary of the triage:
Summary of the actions that will be performed:
This entire triage process was automated by AI and mistakes may have been made. Please let us know so we can continue to improve. |
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.
This pull request updates the documentation and submodule handling process to prevent critical issues when merging native dependency updates, specifically around squash-merging and submodule references. It also updates the
externals/skiasubmodule to a new commit.Critical documentation updates to merge process:
.github/skills/native-dependency-update/SKILL.mdabout the dangers of merging both PRs without updating the submodule in between, highlighting that squash-merging creates a new SHA and can orphan commits, breaking users if the submodule isn't updated.Submodule update:
externals/skiasubmodule to point to commit346cbd67e038d3b432b08a89316527625cd30ecc.