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.

Sign up for GitHub

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

Jump to bottom

chore(package-lock): remove git conflict, invalid versions #1869

Merged
merged 1 commit into from
Feb 17, 2022
Merged

chore(package-lock): remove git conflict, invalid versions #1869

merged 1 commit into from
Feb 17, 2022

Conversation

wraithgar
Copy link
Contributor

Invalid typescript version makes npm ci fail in the latest npm npm/cli#4363

Merge conflict was introduced in #1771

@wraithgar
chore(package-lock): remove git conflict, invalid versions
65fbd12 
Invalid typescript version makes `npm ci` fail in the latest npm
npm/cli#4363

Merge conflict was introduced in
primer#1771
@wraithgar wraithgar requested review from a team and mperrotti February 17, 2022 15:23
@changeset-bot
Copy link

changeset-bot bot commented Feb 17, 2022

⚠️ No Changeset found

Latest commit: 65fbd12

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

siddharthkp
siddharthkp approved these changes Feb 17, 2022
View reviewed changes
Copy link
Member

@siddharthkp siddharthkp left a comment

Choose a reason for hiding this comment

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

Thank you for catching this!

@siddharthkp
Copy link
Member

I'm surprised because this has been in the codebase for a week and did not make our CI fail 🤔

cc @colebemis @rezrah

@siddharthkp siddharthkp added the skip changeset This change does not need a changelog label Feb 17, 2022
@wraithgar
Copy link
Contributor Author

wraithgar commented Feb 17, 2022 •
edited
Loading

I'm surprised because this has been in the codebase for a week and did not make our CI fail 🤔

The default npm that ships with node 16 is npm@8.3.1, validation was turned (back) on in npm@8.4.1

ETA: automatic merge conflict resolution has been part of npm for a long time, and you could have run just fine with this, it made sense to just fix it all in one go.

@siddharthkp siddharthkp merged commit b22a795 into primer:main Feb 17, 2022
@wraithgar wraithgar deleted the gar/package-lock-git-conflict branch February 17, 2022 16:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@siddharthkp siddharthkp siddharthkp approved these changes

@mperrotti mperrotti Awaiting requested review from mperrotti

Assignees
No one assigned
Labels
skip changeset This change does not need a changelog
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@wraithgar @siddharthkp