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

fix: 3way merge result model save error #3403

Merged
merged 1 commit into from
Mar 14, 2024

Conversation

opensumi[bot]
Copy link
Contributor

@opensumi opensumi bot commented Mar 14, 2024

Types

  • 🐛 Bug Fixes

Background or solution

由于 3way 模式中 result 视图打开的是 git 协议的文件,而在 git 插件里 git 协议的文件是只读的,导致在执行 save 事件的时候右下角提示 Method not implemented。尤其是开启了自动保存之后,导致频繁报错。

Changelog


Backport from #3361 a350542

Thanks to @Ricbet for your valuable contribution.

@opensumi opensumi bot added 🚧 backport 🐞 bug Something isn't working labels Mar 14, 2024
@Ricbet Ricbet self-assigned this Mar 14, 2024
Copy link
Member

@AhkunTa AhkunTa left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link

codecov bot commented Mar 14, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 57.59%. Comparing base (a7bb17f) to head (bc80491).

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3403      +/-   ##
==========================================
- Coverage   57.61%   57.59%   -0.02%     
==========================================
  Files        1427     1427              
  Lines       87840    87840              
  Branches    18100    18100              
==========================================
- Hits        50605    50595      -10     
- Misses      33869    33878       +9     
- Partials     3366     3367       +1     
Flag Coverage Δ
jsdom 52.80% <ø> (-0.02%) ⬇️
node 16.12% <ø> (ø)

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.

@AhkunTa AhkunTa merged commit 56d97f5 into main Mar 14, 2024
12 checks passed
@AhkunTa AhkunTa deleted the backport/queue/3361-202431463431 branch March 14, 2024 07:46
@erha19 erha19 added the v3 OpenSumi 3.0 label Mar 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🚧 backport 🐞 bug Something isn't working v3 OpenSumi 3.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants