New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[rel/3.7] Change that will conflict in rel/3.7 to test backport #4612

Closed

Closed

-Original file line number
+Diff line change
@@ Expand Up / @@ -21,6 +21,7 @@ @@
         public ReadOnlyCollection<string> StandardErrorLines { get; } = standardErrorLines;
+    <<<<<<< HEAD
         public override string ToString()
         {
             StringBuilder stringBuilder = new();
@@ Expand All / @@ -34,4 +35,18 @@ @@
             return stringBuilder.ToString();
         }
+    =======
+        public override string ToString() =>
+            $"""
+             Command: {CommandCauseConflict}
+             ====================
+             ExitCode: {ExitCode}
+             ====================
+             StandardOutput:
+             {StandardOutput}
+             ====================
+             StandardError:
+             {StandardError}
+             """;
+    >>>>>>> Change that will conflict in rel/3.7 to test backport
     }

Provide feedback