-
Notifications
You must be signed in to change notification settings - Fork 2.9k
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
[No QA] Update package.json name to fix conflict issues #4578
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Jag96
changed the title
Update package.json name to fix conflict issues
[No QA] Update package.json name to fix conflict issues
Aug 11, 2021
roryabraham
approved these changes
Aug 11, 2021
luacmartins
approved these changes
Aug 11, 2021
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.
LGTM
Feel free to self-merge once tests pass. |
Tests passed! Merging |
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
5 tasks
This was referenced Aug 12, 2021
🚀 Deployed to production by @roryabraham in version: 1.0.86-11 🚀
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
cc @parasharrajat @Julesssss
Details
This PR updates the package.json/package-lock.json to include a change from #4408 in an attempt to fix the conflicts that come up when any other PR is merged. Since that PR base branch is not internal, it isn't easy for any internal engineer to update it to resolve the conflicts, resulting in a lot of back and forth.
When resolving the conflicts locally, it looks like the only two affected files are package.json/package-lock.json, which is why these are the only files updated here.
Fixed Issues
Related to #4408
Tests
Confirm you can run the app on all platforms
QA Steps
None
Tested On