feat: optimize merge conflict

[bytemain]

Types

• 🎉 New Features

Background or solution

1. 检测当前文档有冲突标记时展示冲突处理工具框
2. 展示冲突处理进度
3. 3way 合并自动合并非冲突变更
4. AI 解决冲突使用 diff 框

CleanShot.2024-04-30.at.15.00.47.mp4

Changelog

[railway-app]

This PR is being deployed to Railway 🚅

core: ◻️ REMOVED

[codecov]

Codecov Report

Attention: Patch coverage is 38.97638% with 310 lines in your changes are missing coverage. Please review.

Project coverage is 56.05%. Comparing base (2fda53d) to head (a6fdb82).

Files	Patch %	Lines
...ages/ai-native/src/browser/merge-conflict/index.ts	0.00%	65 Missing and 11 partials ⚠️
...owser/contrib/merge-editor/view/actions-manager.ts	0.00%	62 Missing and 11 partials ⚠️
...trib/merge-editor/view/editors/resultCodeEditor.ts	54.65%	35 Missing and 4 partials ⚠️
...owser/contrib/merge-editor/merge-editor.service.ts	30.00%	18 Missing and 3 partials ⚠️
...src/browser/contrib/merge-editor/widget/facotry.ts	42.85%	14 Missing and 2 partials ⚠️
packages/editor/src/browser/hooks/useEditor.ts	21.05%	13 Missing and 2 partials ⚠️
...ages/editor/src/browser/hooks/useInMergeChanges.ts	29.41%	9 Missing and 3 partials ⚠️
...er/contrib/merge-editor/mapping-manager.service.ts	54.16%	11 Missing ⚠️
...itor/src/browser/merge-conflict/conflict-parser.ts	18.18%	7 Missing and 2 partials ⚠️
.../browser/contrib/merge-editor/model/inner-range.ts	0.00%	9 Missing ⚠️
... and 7 more

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #3585      +/-   ##
==========================================
+ Coverage   56.00%   56.05%   +0.05%     
==========================================
  Files        1503     1510       +7     
  Lines       91521    91707     +186     
  Branches    18756    18795      +39     
==========================================
+ Hits        51252    51406     +154     
- Misses      33394    33434      +40     
+ Partials     6875     6867       -8     

Flag	Coverage Δ
jsdom	51.47% <38.97%> (+0.06%)	⬆️
node	15.62% <2.16%> (-0.02%)	⬇️

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.

[bytemain]

/next

[opensumi]

🎉 PR Next publish successful!

2.27.3-next-1714463163.0

[Ricbet]

LGTM

[bytemain]

/next

[opensumi]

🎉 PR Next publish successful!

2.27.3-next-1714464252.0

[erha19]

/next

[opensumi]

🎉 PR Next publish successful!

2.27.3-next-1714467303.0

[erha19]

LGTM