wuxu/codeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化代码冲突解决

Browse Source
This commit is contained in:
xintaofei
2026-03-14 21:17:26 +08:00
parent 4129f02985
commit 2b679b5ba8
19 changed files with 165 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/i18n/messages/en.json
View File

@@ -557,6 +557,7 @@
"allResolved": "All conflicts resolved",
"conflictFiles": "Conflict Files",
"loadingFile": "Loading file...",
"preparingMerge": "Preparing merge...",
"selectFile": "Select a file to resolve",
"noConflicts": "No conflict files",
"skipFile": "Skip",