Repository navigation
fix(latte): 改进同步冲突解决体验 - #15
Merged
Merged
Conversation
增加行级 Diff、可读预览、全部保留远端、删除场景文案，以及明确合并结果区的手动合并窗口。 Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
InitializeComponent 期间视图切换早于面板字段赋值；改为初始化后再勾选对照，并加固 Diff/打开异常处理。 Co-authored-by: Cursor <cursoragent@cursor.com>
不再依赖 DialogResult==true，避免标题栏关闭时冲突图标残留。 Co-authored-by: Cursor <cursoragent@cursor.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Test plan
dotnet test … --filter Conflict（13 通过）Made with Cursor