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.

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

optimize: fix typo, applicationContex to applicationContext #3654

Merged
merged 2 commits into from
Apr 28, 2021
Merged

optimize: fix typo, applicationContex to applicationContext #3654

merged 2 commits into from
Apr 28, 2021

Conversation

drgnchan
Copy link
Contributor

Ⅰ. Describe what this PR did

just fix typo

Ⅱ. Does this pull request fix one issue?

Ⅲ. Why don't you add test cases (unit test/integration test)?

just fix typo

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

Copy link
Contributor

@funky-eyes funky-eyes left a comment

Choose a reason for hiding this comment

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

LGTM, 注:1.4.2发布后再做合并,标题以optimize: 开头 标题简洁描写pr内容是什么

@funky-eyes funky-eyes added this to the 1.5.0 milestone Apr 21, 2021
@codecov-commenter
Copy link

codecov-commenter commented Apr 21, 2021

Codecov Report

Merging #3654 (f7edd03) into develop (1ec5e03) will increase coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #3654      +/-   ##
=============================================
+ Coverage      51.91%   51.92%   +0.01%     
  Complexity      3503     3503              
=============================================
  Files            639      639              
  Lines          21181    21181              
  Branches        2633     2633              
=============================================
+ Hits           10996    10999       +3     
+ Misses          9091     9089       -2     
+ Partials        1094     1093       -1     
Impacted Files Coverage Δ Complexity Δ
...n/src/main/java/io/seata/common/util/IdWorker.java 83.33% <0.00%> (+6.25%) 12.00% <0.00%> (+1.00%)

Copy link
Contributor

@l81893521 l81893521 left a comment

Choose a reason for hiding this comment

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

LGTM

@drgnchan drgnchan changed the title fix typo optimize: fix typo, applicationContex to applicationContext Apr 22, 2021
@funky-eyes
Copy link
Contributor

请登记pr信息及个人信息到changes文件夹中的2个1.5.0.md文件中

@funky-eyes
Copy link
Contributor

冲突了,解决以下,你把其它pr里的内容拿过来了,你应该合并seata/develop分支的代码后,在进行补充
先回滚到之前的commitid
git pull seata仓库的remote develop合并后,在修改

@drgnchan
Copy link
Contributor Author

不好意思,我下午操作失误了。刚刚我强制回滚到了我的上次提交,然后pull rebase了seata官方仓库的develop分支,结果中间的部分提交也出现在了上面,感觉怪怪的,不知道做对了没

@funky-eyes
Copy link
Contributor

不好意思,我下午操作失误了。刚刚我强制回滚到了我的上次提交,然后pull rebase了seata官方仓库的develop分支,结果中间的部分提交也出现在了上面,感觉怪怪的,不知道做对了没

现在越来越不对了,直接回滚到之前的提交记录,git pull 官方仓库 develop即可

@drgnchan drgnchan closed this Apr 27, 2021
@drgnchan drgnchan reopened this Apr 27, 2021
Copy link
Contributor

@funky-eyes funky-eyes left a comment

Choose a reason for hiding this comment

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

LGTM

@funky-eyes funky-eyes merged commit a8e553f into apache:develop Apr 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants