Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Emscripten SDK cleanly #473

Merged
merged 1 commit into from
May 21, 2019
Merged

Update Emscripten SDK cleanly #473

merged 1 commit into from
May 21, 2019

Commits on May 21, 2019

  1. Update Emscripten SDK cleanly

    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.
    ilammy committed May 21, 2019
    Configuration menu
    Copy the full SHA
    55d9268 View commit details
    Browse the repository at this point in the history