Skip to content

fix: 处理冲突时直接重新提交#170

Merged
he0119 merged 3 commits intomainfrom
fix/pr-closed
Aug 23, 2023
Merged

fix: 处理冲突时直接重新提交#170
he0119 merged 3 commits intomainfrom
fix/pr-closed

Conversation

@he0119
Copy link
Copy Markdown
Member

@he0119 he0119 commented Aug 23, 2023

此时没有测试环境, 并且之前的测试结果应该依旧有效。

fix #161

@he0119 he0119 enabled auto-merge (squash) August 23, 2023 02:53
@github-actions github-actions bot added the bug Something isn't working label Aug 23, 2023
@he0119 he0119 disabled auto-merge August 23, 2023 02:54
@codecov
Copy link
Copy Markdown

codecov bot commented Aug 23, 2023

Codecov Report

Merging #170 (8ddab9f) into main (e9baf90) will increase coverage by 0.30%.
The diff coverage is 88.88%.

❗ Current head 8ddab9f differs from pull request most recent head f7ad9e0. Consider uploading reports for the commit f7ad9e0 to get more accurate results

@@            Coverage Diff             @@
##             main     #170      +/-   ##
==========================================
+ Coverage   96.20%   96.51%   +0.30%     
==========================================
  Files          14       14              
  Lines         791      803      +12     
==========================================
+ Hits          761      775      +14     
+ Misses         30       28       -2     
Files Changed Coverage Δ
src/plugins/publish/utils.py 92.85% <88.00%> (+1.26%) ⬆️
src/plugins/publish/__init__.py 97.93% <100.00%> (ø)

@he0119 he0119 enabled auto-merge (squash) August 23, 2023 03:09
@he0119 he0119 merged commit 0fbebdd into main Aug 23, 2023
@he0119 he0119 deleted the fix/pr-closed branch August 23, 2023 03:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

bug: 合并后更新拉取请求失败

1 participant