stella-ops.org/git.stella-ops.org
1
0
Fork 0
Code Issues Pull Requests Actions 2 Releases Wiki Activity

Merge branch 'main' of https://git.stella-ops.org/stella-ops.org/git.stella-ops.org

Browse Source
This commit is contained in:
StellaOps Bot
2026-01-06 21:03:06 +02:00
parent 8cb2bc677a 4789027317
commit 05833e0af2
841 changed files with 15706 additions and 68106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Cli/StellaOps.Cli/Output/CliErrorRenderer.cs
View File

@@ -223,16 +223,26 @@ internal static class CliErrorRenderer
return false;
}
<<<<<<< HEAD
string? code1 = null;
string? code2 = null;
if ((!error.Metadata.TryGetValue("reason_code", out code1) || string.IsNullOrWhiteSpace(code1)) &&
(!error.Metadata.TryGetValue("reasonCode", out code2) || string.IsNullOrWhiteSpace(code2)))
=======
string? tempCode;
if ((!error.Metadata.TryGetValue("reason_code", out tempCode) || string.IsNullOrWhiteSpace(tempCode)) &&
(!error.Metadata.TryGetValue("reasonCode", out tempCode) || string.IsNullOrWhiteSpace(tempCode)))
>>>>>>> 47890273170663b2236a1eb995d218fe5de6b11a
{
return false;
}
<<<<<<< HEAD
reasonCode = OfflineKitReasonCodes.Normalize(code1 ?? code2 ?? "") ?? "";
=======
reasonCode = OfflineKitReasonCodes.Normalize(tempCode!) ?? "";
>>>>>>> 47890273170663b2236a1eb995d218fe5de6b11a
return reasonCode.Length > 0;
}