Skip to content

code refactoring for container package#14989

Closed
artemgurzhii wants to merge 4 commits intoemberjs:masterfrom
artemgurzhii:container
Closed

code refactoring for container package#14989
artemgurzhii wants to merge 4 commits intoemberjs:masterfrom
artemgurzhii:container

Conversation

@artemgurzhii
Copy link
Contributor

No description provided.

@stefanpenner
Copy link
Member

CI seems unhappy

Copy link
Member

@stefanpenner stefanpenner left a comment

Choose a reason for hiding this comment

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

:shipit: once green.

@homu
Copy link
Contributor

homu commented Mar 14, 2017

☔ The latest upstream changes (presumably #15014) made this pull request unmergeable. Please resolve the merge conflicts.

@artemgurzhii
Copy link
Contributor Author

@homu done!

Copy link
Member

Choose a reason for hiding this comment

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

We typically want to avoid lines that are too long. I also feel the former is easier to read

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I was looking at this pull request. Should I replace it?

let injections = this._injections[fullName] || [];
if (this.fallback) {
injections = injections.concat(this.fallback.getInjections(fullName));
injections.push(...this.fallback.getInjections(fullName));
Copy link
Contributor

@bekzod bekzod Mar 17, 2017

Choose a reason for hiding this comment

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

so you are modifying this._injections[fullName] ? , because former did not do that

Copy link
Contributor

Choose a reason for hiding this comment

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

I hope you are not polluting this._injections[fullName] here :P

Copy link
Contributor

Choose a reason for hiding this comment

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

before/after is not same here, so each time you call getInjections it it modifies this._injections[fullName] if there is fallback. am I wrong ? @stefanpenner @artemgurzhii

@bekzod
Copy link
Contributor

bekzod commented Mar 17, 2017

@stefanpenner is merging master to PR branch is right way to update with master ?

@stefanpenner
Copy link
Member

@bekzod the best way is to rebase.

git fetch origin
# while on your working branch
git rebase origin/master

@bekzod
Copy link
Contributor

bekzod commented Mar 17, 2017

@stefanpenner just asking because this one was merged, but if it is accepted then cool

@homu
Copy link
Contributor

homu commented Mar 26, 2017

☔ The latest upstream changes (presumably #15043) made this pull request unmergeable. Please resolve the merge conflicts.

@homu
Copy link
Contributor

homu commented May 1, 2017

☔ The latest upstream changes (presumably #15193) made this pull request unmergeable. Please resolve the merge conflicts.

@locks
Copy link
Contributor

locks commented May 18, 2017

Closing this one due to conflicts, feel free to give it another go!

@locks locks closed this May 18, 2017
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.

5 participants