- 
                Notifications
    You must be signed in to change notification settings 
- Fork 11.9k
feat: show typescript version on ng version #7372
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
Conversation
There was a problem hiding this 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.
There was a problem hiding this 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.
| @hansl can I simply click on the Resolve conflicts to fix the conflict or that isn't allowed? | 
4f78a93    to
    dc4ca5b      
    Compare
  
    | You can try, but we've never had any success with that button :) . The new errors are because you have  Thanks! | 
| @hansl Thanks very much! | 
| This issue has been automatically locked due to inactivity. Read more about our automatic conversation locking policy. This action has been performed automatically by a bot. | 
Fixes #6627