You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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
@GeoffreyBooth here's 2 with post-#4585master merged. The test case in #4585 needed to be updated due to the grammar changes introduced by #4493 (object spread)
I wasn't sure how to resolve the merge conflict in documentation/sections/introduction.md - I deleted the "CoffeeScript 2 is coming..." conflict line b/c we're on 2 here but not sure how documentation works (for master vs 2)?
Hey, I merged master into 2 before the 2.0.0-beta3 release. After that release I made one additional commit on master with that new text in introduction.md, and the updated docs/v1 documentation files as a result. You are correct that the 2 branch’s introduction.md should be unchanged as a result.
But why are you seeing differences in rewriter.js etc.? Those should’ve gotten merged into 2 when I merged master in, unless I resolved some conflicts incorrectly?
@GeoffreyBooth this was based on your comment in #4585 that you ran into merge conflicts/errors when merging those changes (which had been merged into master) into 2. And I don't see any sign of the changes from #4585 on current 2
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.
@GeoffreyBooth here's
2with post-#4585mastermerged. The test case in #4585 needed to be updated due to the grammar changes introduced by #4493 (object spread)I wasn't sure how to resolve the merge conflict in
documentation/sections/introduction.md- I deleted the "CoffeeScript 2 is coming..." conflict line b/c we're on2here but not sure how documentation works (formastervs2)?