Prefix 'unmerged changes' with 'TODO' (#62319)

dotnet · Jan 2, 2025 · 9c189e7 · 9c189e7
2 parents dabda72 + ce0f266
commit 9c189e7
Show file tree

Hide file tree

Showing 17 changed files with 79 additions and 78 deletions.
diff --git a/src/EditorFeatures/Test2/Rename/RenameTagProducerTests.vb b/src/EditorFeatures/Test2/Rename/RenameTagProducerTests.vb
@@ -352,7 +352,7 @@ public class Class1
     void Test(int i) {{ }}
     void M()
     {{
-{{|conflict:{{|conflict:<<<<<<< {String.Format(WorkspacesResources.Unmerged_change_from_project_0, "CSharpAssembly1")}, {WorkspacesResources.Before_colon}
+{{|conflict:{{|conflict:<<<<<<< {String.Format(WorkspacesResources.TODO_Unmerged_change_from_project_0, "CSharpAssembly1")}, {WorkspacesResources.Before_colon}
         Test(5);
 =======
         Test((long)5);

diff --git a/...e/Portable/LinkedFileDiffMerging/AbstractLinkedFileMergeConflictCommentAdditionService.cs b/...e/Portable/LinkedFileDiffMerging/AbstractLinkedFileMergeConflictCommentAdditionService.cs
@@ -76,7 +76,7 @@ private static ImmutableArray<TextChange> GetCommentChangesForDocument(IEnumerab
             var newText = oldText.WithChanges(adjustedChanges);
 
             var warningText = GetConflictCommentText(
-                string.Format(WorkspacesResources.Unmerged_change_from_project_0, projectName),
+                string.Format(WorkspacesResources.TODO_Unmerged_change_from_project_0, projectName),
                 TrimBlankLines(oldText),
                 TrimBlankLines(newText));
 

diff --git a/src/Workspaces/Core/Portable/WorkspacesResources.resx b/src/Workspaces/Core/Portable/WorkspacesResources.resx
@@ -249,8 +249,9 @@
   <data name="Solution_file_not_found_colon_0" xml:space="preserve">
     <value>Solution file not found: '{0}'</value>
   </data>
-  <data name="Unmerged_change_from_project_0" xml:space="preserve">
-    <value>Unmerged change from project '{0}'</value>
+  <data name="TODO_Unmerged_change_from_project_0" xml:space="preserve">
+    <value>TODO: Unmerged change from project '{0}'</value>
+    <comment>{Locked="TODO"}</comment>
   </data>
   <data name="After" xml:space="preserve">
     <value>After</value>

diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.cs.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.cs.xlf
diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.de.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.de.xlf
diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.es.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.es.xlf
diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.fr.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.fr.xlf
diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.it.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.it.xlf
diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ja.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ja.xlf
diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ko.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ko.xlf
diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.pl.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.pl.xlf
diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.pt-BR.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.pt-BR.xlf
diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ru.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.ru.xlf
diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.tr.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.tr.xlf
diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.zh-Hans.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.zh-Hans.xlf
diff --git a/src/Workspaces/Core/Portable/xlf/WorkspacesResources.zh-Hant.xlf b/src/Workspaces/Core/Portable/xlf/WorkspacesResources.zh-Hant.xlf