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

Upgrade broccoli-merge-trees #9790

Merged
merged 1 commit into from Feb 24, 2022
Merged

Upgrade broccoli-merge-trees #9790

merged 1 commit into from Feb 24, 2022

Conversation

locks
Copy link
Contributor

@locks locks commented Feb 18, 2022

In ember-app.js there was a substitution of broccoli-merge-trees with the project's merge-trees utility:

-    let combinedPackageTree = new BroccoliMergeTrees(trees);
+    let combinedPackageTree = mergeTrees(trees);

This was making tests fail so I brought it back to the original code. If the tests should have actually passed then I suggest we open an issue and follow up separately.

@locks locks force-pushed the upgrade-broccoli-merge-trees branch from 2d789e3 to 97af8fe Compare February 18, 2022 18:04
@locks locks requested a review from rwjblue February 18, 2022 19:30
@locks locks force-pushed the upgrade-broccoli-merge-trees branch from 97af8fe to cd3cec9 Compare February 18, 2022 19:30
@locks locks force-pushed the upgrade-broccoli-merge-trees branch from cd3cec9 to aaf7b2a Compare February 23, 2022 21:35
@locks locks enabled auto-merge February 24, 2022 00:43
@locks locks merged commit 26b3d31 into master Feb 24, 2022
@locks locks deleted the upgrade-broccoli-merge-trees branch February 24, 2022 01:40
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.

None yet

2 participants