Avoid merge conflicts in build-js.sh#1286
Merged
kripken merged 3 commits intoWebAssembly:masterfrom Nov 13, 2017
Merged
Conversation
Changes the EXPORTED_FUNCTIONS parameter from a single to multiple lines. This not only makes it easier to extend by a human but also prevents some merge conflicts.
Contributor
Author
|
Seems the AppVeyor build failed for a different reason. |
Member
|
Good idea, thanks. Sorry, I already merged one of those 2 PRs since I didn't read this one til later. Would you prefer to merge this in before the remaining one? Btw, this will also be useful when we need to use that list more than once, which will be the case when we have a |
Contributor
Author
|
Should be good to merge once the checks complete. I just recently merged master when I noticed that the other one landed. I believe the second still needs some review updates anyway. |
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
2 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.
Changes the EXPORTED_FUNCTIONS parameter from a single to multiple lines. This not only makes it easier to extend by a human but also prevents some merge conflicts.
#1280 and #1274 would have to be updated if this one lands earlier, which I'd prefer.