Update Emscripten SDK cleanly #473
Merged
Conversation
This file contains 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
For some reason building with Emscripten changes some files in the
SDK which leads to errors when trying to update with "git pull":
Updating 4eeff61..751355a
error: Your local changes to the following files would be overwritten by merge:
binaryen-tags.txt
emscripten-tags.txt
upstream/lkgr.json
Please, commit your changes or stash them before you can merge.
Aborting
Add a "git reset" before doing the pull to discard any local changes
and ensure a clean merge with the updated version.
Lagovas
approved these changes
May 21, 2019
|
Android builds started failing recently as well. We'll address that in a separate PR. |
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.
Our CI builds started failing recently.
For some reason building with Emscripten changes some files in the SDK which leads to errors when trying to update with
git pull:Add a
git resetbefore doing the pull to discard any local changes and ensure a clean merge with the updated version.