-
Notifications
You must be signed in to change notification settings - Fork 465
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
Fix bug in C-API with context compiler status #1038
Conversation
0ca5a03
to
7ee0c1b
Compare
7ee0c1b
to
bb4777c
Compare
Looks like this PR fixes the problem! tested the following way:
is there a simpler way to locally merge a PR manually adding all PRs to
|
This is how I do it
|
Thanks @rodneyrehm for the positive news! Again sorry for messing that one up! Going to merge this now, since I can confirm that node-sass does not segfault anymore (@am11 only one test failing) ! |
Fix bug in C-API with context compiler status
splendid, thank you for the quick fix! |
@mgreter, thanks! Should I wait for the next beta? @rodneyrehm, I always tend to use pull with rebase. :) Once I added the remotes after the first clone: # first time
cd src/
git clone https://github.com/sass/libsass
cd libsass
git remote add mgreter-libsass https://github.com/mgreter/libsass
git remote add xzyfer-libsass https://github.com/xzyfer/libsass later at any random point in time: cd src/libsass
git pull --rebase mgreter-libsass feature-branch-name (it fetches and rebase on your current branch and fallbacks to 3-way merge if there are conflicts which normally doesn't happen if you have added libsass as submodule like node-sass has) |
@am11 use the latest master to update node-sass to. When you are ready to release a new beta for node-sass please, ping us and we will make another libsass beta! |
Fixes #1035 @am11, @rodneyrehm can you test if this fixes your issues?
This does NOT alter the existing public (beta) API, only internal changes!