Skip to content

Conversation

jordanbtucker
Copy link
Member

Fixes #57

@aeisenberg
Copy link
Collaborator

Thanks for the pull request! The travis CI build has failed, but it doesn't look like it's anything related to your PR. The commits look good and I would like to merge, but I don't want to until we have a clean build. Would you mind pushing again and seeing if this is a transient problem?

@jordanbtucker
Copy link
Member Author

I think the problem is with the develop branch. .travis.yml lists a Node version of 0.9, but the travis CI VM doesn't have 0.9 installed.

@aeisenberg
Copy link
Collaborator

Looks like that's right. But, this build was working in the past. Perhaps this particular build node is not the same as the others and doesn't have 0.9 installed (while the others do).

@jordanbtucker
Copy link
Member Author

Looks like you can trigger a re-run of a Travis CI build if you're logged in.

@aseemk
Copy link
Member

aseemk commented Jul 29, 2014

Thanks for fixing the build issue! @jordanbtucker, do you know how to git rebase? If you rebase this branch to the latest master now, the CI should pass again.

We should add a CONTRIBUTING.md, but as a matter of habit, it's always nice to rebase branches/pull requests before merging them, to ensure clean merges (not just logistically but logically too).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor: 4-spaces here too.

jordanbtucker added a commit that referenced this pull request Jul 29, 2014
@jordanbtucker jordanbtucker merged commit 1d18653 into json5:develop Jul 29, 2014
@jordanbtucker jordanbtucker deleted the allow-duplicate-keys branch July 29, 2014 16:39
@jordanbtucker
Copy link
Member Author

Thanks for the rebase tip.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants