This repository has been archived by the owner on Dec 10, 2024. It is now read-only.
Describe resolution of mocha/chai conflicts #11
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
Add description of how to resolve bower.json conflicts for Mocha/Chai. Choosing the higher version gives bower errors.
|
There may be better ways to ultimately solve this issue, but this should help those new to the project installing after generating new applications. I received these conflicts after creating a brand new Ember-CLI (v. 0.1.3) application and following the README instructions. |
|
👍 |
dgeb
added a commit
that referenced
this pull request
Dec 2, 2014
Describe resolution of mocha/chai conflicts
|
Merging for now, and will investigate the heart of the problem soon. Thanks @clekstro ! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Add description of how to resolve bower.json conflicts for Mocha/Chai. Choosing the higher version gives bower errors.