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

Use Ember.assign instead of Ember.merge #54

Merged
merged 2 commits into from
Jun 22, 2016
Merged

Conversation

amk221
Copy link
Contributor

@amk221 amk221 commented Apr 12, 2016

@@ -133,7 +133,7 @@
'default': Ember.Object
},
'ember-platform': {
'assign': Ember.merge,
'assign': Ember.assign,
Copy link
Member

Choose a reason for hiding this comment

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

Can you make this fallback?

Ember.assign || Ember.merge

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ah, sure. Done

@rwjblue rwjblue merged commit f1a4373 into ember-cli:master Jun 22, 2016
@rwjblue
Copy link
Member

rwjblue commented Jun 22, 2016

Thank you!

@john-kurkowski
Copy link

john-kurkowski commented Aug 24, 2016

Are merge and assign the same thing in Ember though? The linked blog post doesn't mention assign as a replacement for merge.

They definitely behave different in Lodash.

Edit: I see my concern is tracked in #76.

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

Successfully merging this pull request may close these issues.

None yet

4 participants