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

feat: update cz & husky #30

Merged
merged 5 commits into from
Jul 27, 2020
Merged

feat: update cz & husky #30

merged 5 commits into from
Jul 27, 2020

Conversation

zouhangwithsweet
Copy link
Contributor

Update cz & husky config

@zouhangwithsweet zouhangwithsweet changed the title Feat/cz & husky feat: update cz & husky Jul 24, 2020
jw-foss
jw-foss requested changes Jul 24, 2020
View reviewed changes
Copy link
Member

@jw-foss jw-foss left a comment

Choose a reason for hiding this comment

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

Remove yarn-error.log

.npmrc
@@ -0,0 +1 @@
registry=https://registry.npmjs.org/
Copy link
Member

Choose a reason for hiding this comment

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

What for?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

prevent developers from using private npm repositories

Copy link
Member

Choose a reason for hiding this comment

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

Maybe configure this to https://registry.npm.taobao.org? Probably better for Chinese Mainland developers

Copy link
Member

Choose a reason for hiding this comment

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

cc @HerringtonDarkholme, any suggestions?

Copy link
Collaborator

Choose a reason for hiding this comment

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

npmrc isn't useful since we already use yarn

Copy link
Member

Choose a reason for hiding this comment

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

Change this to yarnrc or just remove this one might be a good choice

@jw-foss
Copy link
Member

jw-foss commented Jul 24, 2020

Loop @HerringtonDarkholme in

@zouhangwithsweet
Copy link
Contributor Author

Remove yarn-error.log

done

@jw-foss
Copy link
Member

jw-foss commented Jul 27, 2020

I think you need to try to cherry pick your changes to a new branch based on the current dev branch, also manually merge main branch into feature branch is not suggested, try use --rebase flag while you actually try to rebase the current dev branch into your working branch.

@jw-foss
Copy link
Member

jw-foss commented Jul 27, 2020

Or simply resolve the conflicts so that we can merge this

@jw-foss jw-foss mentioned this pull request Jul 27, 2020
Closed
@HerringtonDarkholme HerringtonDarkholme merged commit bb353a1 into dev Jul 27, 2020
@HerringtonDarkholme HerringtonDarkholme mentioned this pull request Jul 27, 2020
Closed
@zouhangwithsweet zouhangwithsweet deleted the feat/cz_&_husky branch July 30, 2020 02:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@HerringtonDarkholme HerringtonDarkholme HerringtonDarkholme approved these changes

@jw-foss jw-foss Awaiting requested review from jw-foss

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

Successfully merging this pull request may close these issues.

None yet
3 participants
@zouhangwithsweet @jw-foss @HerringtonDarkholme