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

yarnのバージョンアップにより、yarn.lockに新しいフィールドが追加されたため反映 #198

Merged
merged 1 commit into from
Oct 19, 2018
Merged

yarnのバージョンアップにより、yarn.lockに新しいフィールドが追加されたため反映 #198

merged 1 commit into from
Oct 19, 2018

Conversation

takayamaki
Copy link
Member

@lnanase
Copy link
Collaborator

lnanase commented Oct 19, 2018

yarnは詳しくなくて申し訳ないのですが、
これは本家案件にはならないのでしょうか？
お手数ですがご教示お願い致します。

@takayamaki
Copy link
Member Author

本家でもこのように mastodon/pull/8901 別のPRのついでに追加されていますので本家案件ではないですー

lnanase
lnanase approved these changes Oct 19, 2018
View reviewed changes
Copy link
Collaborator

@lnanase lnanase left a comment

Choose a reason for hiding this comment

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

先行してのPRであること承知致しました。

LGTM

@takayamaki
Copy link
Member Author

yarn.lockはコンフリクトしてもyarn installしなおせばyarnが勝手に解消してくれるので、何かするたびにここに差分が出るよりはいいかなと思います

@takayamaki takayamaki merged commit fbadf42 into imas:imastodon Oct 19, 2018
@takayamaki takayamaki deleted the fix/add-integrity-in-yarn-lock branch October 19, 2018 12:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lnanase lnanase lnanase approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@takayamaki @lnanase