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

feat: show typescript version on ng version #7372

Merged
merged 5 commits into from
Aug 20, 2017

Conversation

tfonji
Copy link
Contributor

@tfonji tfonji commented Aug 13, 2017

Fixes #6627

@tfonji tfonji changed the title feat: Add typescript version to ng version feat: add typescript version to ng version Aug 13, 2017
@tfonji tfonji changed the title feat: add typescript version to ng version feat: show typescript version to ng version Aug 13, 2017
@tfonji tfonji changed the title feat: show typescript version to ng version feat: show typescript version on ng version Aug 13, 2017
Copy link
Contributor

@hansl hansl left a comment

Choose a reason for hiding this comment

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

Hi @tfonji. package-lock.json should not have any changes. Could you revert it?

You can use git checkout master package-lock.json to revert it, then git push -f to force push to your own branch. Github will pick the rest.

Copy link
Contributor

@hansl hansl left a comment

Choose a reason for hiding this comment

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

Blocking this until above comment is resolved. otherwise looks good to me.

@tfonji
Copy link
Contributor Author

tfonji commented Aug 18, 2017

@hansl can I simply click on the Resolve conflicts to fix the conflict or that isn't allowed?

@tfonji tfonji force-pushed the add-typescript-version-issue-6627 branch from 4f78a93 to dc4ca5b Compare August 19, 2017 02:05
@hansl
Copy link
Contributor

hansl commented Aug 20, 2017

You can try, but we've never had any success with that button :) . The new errors are because you have Revert commits which don't follow our naming conventions. I'll squash your PR, but in the future we normally just accept a single commit for PR and it would need to be squashed.

Thanks!

@hansl hansl merged commit 9ee78ab into angular:master Aug 20, 2017
@tfonji tfonji deleted the add-typescript-version-issue-6627 branch August 20, 2017 19:11
@tfonji tfonji restored the add-typescript-version-issue-6627 branch August 20, 2017 19:11
@tfonji
Copy link
Contributor Author

tfonji commented Aug 20, 2017

@hansl Thanks very much!

@tfonji tfonji deleted the add-typescript-version-issue-6627 branch August 20, 2017 19:13
@tfonji tfonji restored the add-typescript-version-issue-6627 branch August 20, 2017 19:13
@tfonji tfonji deleted the add-typescript-version-issue-6627 branch August 20, 2017 19:19
dond2clouds pushed a commit to d2clouds/speedray-cli that referenced this pull request Apr 23, 2018
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Sep 12, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Display typescript version being used during ng build --progress and/or ng build --verbose
3 participants