feat: add autoApplyNonConflictChanges configuration#3829
Conversation
|
This PR was not deployed automatically as @Ricbet does not have access to the Railway project. In order to get automatic PR deploys, please add @Ricbet to the project inside the project settings page. |
|
Warning Rate limit exceeded@Ricbet has exceeded the limit for the number of commits or files that can be reviewed per hour. Please wait 3 minutes and 48 seconds before requesting another review. How to resolve this issue?After the wait time has elapsed, a review can be triggered using the We recommend that you space out your commits to avoid hitting the rate limit. How do rate limits work?CodeRabbit enforces hourly rate limits for each developer per organization. Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout. Please see our FAQ for further information. Walkthrough此次变更主要增加了一个新的首选项 Changes
Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (invoked as PR comments)
Additionally, you can add CodeRabbit Configration File (
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 0
Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Files selected for processing (5)
- packages/core-browser/src/core-preferences.ts (1 hunks)
- packages/i18n/src/common/en-US.lang.ts (1 hunks)
- packages/i18n/src/common/zh-CN.lang.ts (1 hunks)
- packages/monaco/src/browser/contrib/merge-editor/merge-editor.service.ts (3 hunks)
- packages/preferences/src/browser/preference-settings.service.ts (1 hunks)
Files skipped from review due to trivial changes (4)
- packages/core-browser/src/core-preferences.ts
- packages/i18n/src/common/en-US.lang.ts
- packages/i18n/src/common/zh-CN.lang.ts
- packages/preferences/src/browser/preference-settings.service.ts
Additional comments not posted (2)
packages/monaco/src/browser/contrib/merge-editor/merge-editor.service.ts (2)
59-61: 注入 PreferenceService注入
PreferenceService以管理新的首选项设置，符合 PR 目标。
433-437: 根据首选项自动应用无冲突更改该逻辑正确地检查首选项设置，并在启用该设置时应用无冲突的更改。这是此 PR 引入的核心功能。
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #3829 +/- ##
==========================================
- Coverage 55.06% 55.05% -0.02%
==========================================
Files 1553 1553
Lines 94634 94637 +3
Branches 19375 19376 +1
==========================================
- Hits 52106 52098 -8
- Misses 35331 35340 +9
- Partials 7197 7199 +2
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
bytemain
changed the title
2 participants
Types
Background or solution
Changelog
merge editor 新增 “自动合并非冲突变更” 配置
Summary by CodeRabbit
新功能
mergeEditor.autoApplyNoConflictChanges，默认值为false。本地化
'preference.mergeEditor.autoApplyNoConflictChanges'，值为“自动应用无冲突的更改”。