don't delete dependencies when merging upstream changes#10484
Merged
Conversation
eanders-ms
approved these changes
Apr 3, 2025
thsparks
approved these changes
Apr 3, 2025
Contributor
thsparks
left a comment
thsparks
left a comment
There was a problem hiding this comment.
ty for adding the more descriptive variable names!
riknoll
added a commit
that referenced
this pull request
Apr 3, 2025
|
Sorry, I am new here. Could you tell me exactly what I have to do to get extensions working with my github makecode project? |
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
3 participants
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.
fixes microsoft/pxt-arcade#6901
this changes our pull/merge code so that we don't completely obliterate any locally added dependencies when merging upstream changes from github.
sorry for the large change; it's just because i renamed some variables that i found hard to remember the meaning of when reading the code. and because i converted a
.forEachto afor ofloop.