Skip to content

fix: 3-way git dirty status#4220

Merged
hacke2 merged 1 commit intov3.6from
fix/3-way-commit
Dec 16, 2024
Merged

fix: 3-way git dirty status#4220
hacke2 merged 1 commit intov3.6from
fix/3-way-commit

Conversation

@Ricbet
Copy link
Copy Markdown
Member

@Ricbet Ricbet commented Dec 11, 2024

Types

  • 🐛 Bug Fixes

Background or solution

Changelog

@Ricbet Ricbet self-assigned this Dec 11, 2024
@opensumi opensumi Bot added the 🐞 bug Something isn't working label Dec 11, 2024
@Ricbet
Copy link
Copy Markdown
Member Author

Ricbet commented Dec 11, 2024

/next

@opensumi
Copy link
Copy Markdown
Contributor

opensumi Bot commented Dec 11, 2024

🎉 PR Next publish successful!

3.6.2-next-1733919984.0

@codecov
Copy link
Copy Markdown

codecov Bot commented Dec 12, 2024

Codecov Report

Attention: Patch coverage is 60.00000% with 2 lines in your changes missing coverage. Please review.

Project coverage is 54.05%. Comparing base (ca15b4c) to head (0943f3d).
Report is 2 commits behind head on v3.6.

Files with missing lines Patch % Lines
...sion/src/hosted/api/vscode/doc/doc-manager.host.ts 33.33% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             v3.6    #4220      +/-   ##
==========================================
- Coverage   54.18%   54.05%   -0.13%     
==========================================
  Files        1616     1616              
  Lines       99701    97967    -1734     
  Branches    20596    20048     -548     
==========================================
- Hits        54021    52955    -1066     
+ Misses      37832    37399     -433     
+ Partials     7848     7613     -235     
Flag Coverage Δ
jsdom 49.63% <60.00%> (-0.20%) ⬇️
node 15.55% <0.00%> (+0.13%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Copy Markdown
Member

@hacke2 hacke2 left a comment

Choose a reason for hiding this comment

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

LGTM

@hacke2 hacke2 merged commit eb3dfcb into v3.6 Dec 16, 2024
@hacke2 hacke2 deleted the fix/3-way-commit branch December 16, 2024 11:55
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] 在3way模式下解决冲突后,通过资源管理面板提交会报错文件未保存

2 participants