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

fix(snapshot): update snapshot #19230

Merged
merged 1 commit into from Oct 15, 2019
Merged

fix(snapshot): update snapshot #19230

merged 1 commit into from Oct 15, 2019

Conversation

yoyo837
Copy link
Contributor

@yoyo837 yoyo837 commented Oct 15, 2019

🤔 This is a ...

  • New feature
  • Bug fix
  • Site / document update
  • Component style update
  • TypeScript definition update
  • Refactoring
  • Code style optimization
  • Test Case
  • Branch merge
  • Other (about what?)

🔗 Related issue link

💡 Background and solution

📝 Changelog

Language Changelog
🇺🇸 English
🇨🇳 Chinese

☑️ Self Check before Merge

  • Doc is updated/provided or not needed
  • Demo is updated/provided or not needed
  • TypeScript definition is updated/provided or not needed
  • Changelog is provided or not needed

tests-checker[bot]
tests-checker bot suggested changes Oct 15, 2019
View reviewed changes
Copy link

@tests-checker tests-checker bot left a comment

Choose a reason for hiding this comment

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

Could you please add tests to make sure this change works as expected?

@netlify
Copy link

netlify bot commented Oct 15, 2019 •
edited

Deploy preview for ant-design ready!

Built with commit 3a37f59

https://deploy-preview-19230--ant-design.netlify.com

@yoyo837 yoyo837 changed the title revert to 8e2b2470b27a63bfa29a2b3552c56ebc6bf0c390 revert to 8e2b247 Oct 15, 2019
@afc163
Copy link
Member

afc163 commented Oct 15, 2019

最好更新一下本地 node_modules 再 update snapshots。

@codecov
Copy link

codecov bot commented Oct 15, 2019 •
edited

Codecov Report

❗ No coverage uploaded for pull request base (master@a9d7178). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master   #19230   +/-   ##
=========================================
  Coverage          ?   97.77%           
=========================================
  Files             ?      282           
  Lines             ?     7625           
  Branches          ?     2097           
=========================================
  Hits              ?     7455           
  Misses            ?      170           
  Partials          ?        0

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a9d7178...3a37f59. Read the comment docs.

@yoyo837 yoyo837 changed the title revert to 8e2b247 fix(snapshot): revert to 8e2b247 Oct 15, 2019
@auto-add-label auto-add-label bot added the bug label Oct 15, 2019
@afc163
Copy link
Member

afc163 commented Oct 15, 2019

/rebase

@afc163
Copy link
Member

afc163 commented Oct 15, 2019 •
edited

感觉还是会有问题，这个 PR 不能 rebase。

看懂了，diff 看着很奇怪，合并之后应该是对的。

@yoyo837
Copy link
Contributor Author

yoyo837 commented Oct 15, 2019

我本地master重新更新snapshot可以了。

@yoyo837
Copy link
Contributor Author

yoyo837 commented Oct 15, 2019

包含在这个PR里了

@afc163
Copy link
Member

afc163 commented Oct 15, 2019

我 rebase 了一下 diff 就对了。ci 过了就合并。

@yoyo837
Copy link
Contributor Author

yoyo837 commented Oct 15, 2019

那就没 revert #19226 功能代码哦！？

@afc163
Copy link
Member

afc163 commented Oct 15, 2019

我搞丢了，再 revert 一下。

@afc163
Copy link
Member

afc163 commented Oct 15, 2019

是不是也不用 revert，你那几行还需要改动么？

@yoyo837
Copy link
Contributor Author

yoyo837 commented Oct 15, 2019

不用，感觉没问题，你看看呗，我当时rebase一下一推送咋莫名其妙merge了。懵了都！

@yoyo837
Copy link
Contributor Author

yoyo837 commented Oct 15, 2019

当前的修改，相当于只修复snapshot了。

@yoyo837 yoyo837 changed the title fix(snapshot): revert to 8e2b247 fix(snapshot): update snapshot Oct 15, 2019
@afc163
Copy link
Member

afc163 commented Oct 15, 2019

不用，感觉没问题，你看看呗，我当时rebase一下一推送咋莫名其妙merge了。懵了都！

你肯定操作失误了 push 到了 master。我猜你是按这个来的。

image

@yoyo837
Copy link
Contributor Author

yoyo837 commented Oct 15, 2019

不是，我在分支上rebase, 然后就推送，没第三个操作

@afc163
Copy link
Member

afc163 commented Oct 15, 2019 •
edited

你本地可以再确认一下 master 上当前关于 #19108 的改动是不是预期的。

@afc163
Copy link
Member

afc163 commented Oct 15, 2019

不是，我在分支上rebase, 然后就推送，没第三个操作

要是有 history 可以自己复盘一下，应该不会是 GitHub 的锅。

@afc163 afc163 merged commit fb2bafb into master Oct 15, 2019
@afc163 afc163 deleted the revert-some-commit branch October 15, 2019 11:13
@weekly-digest weekly-digest bot mentioned this pull request Oct 20, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tests-checker tests-checker[bot] tests-checker requested changes

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
2 participants
@yoyo837 @afc163