resolve merge conflict

aws · Feb 7, 2025 · 2311317 · 2311317
1 parent 622de5a
commit 2311317
Show file tree

Hide file tree

Showing 2 changed files with 393 additions and 85 deletions.
diff --git a/...nity/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/BuildStepStatus.kt b/...nity/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/BuildStepStatus.kt
@@ -18,4 +18,5 @@ fun mapTransformationPlanApiStatus(apiStatus: TransformationProgressUpdateStatus
     TransformationProgressUpdateStatus.FAILED, TransformationProgressUpdateStatus.SKIPPED, TransformationProgressUpdateStatus.PAUSED -> BuildStepStatus.WARNING
     TransformationProgressUpdateStatus.AWAITING_CLIENT_ACTION, TransformationProgressUpdateStatus.IN_PROGRESS -> BuildStepStatus.WORKING
     TransformationProgressUpdateStatus.UNKNOWN_TO_SDK_VERSION -> BuildStepStatus.ERROR
+    TransformationProgressUpdateStatus.SKIPPED -> TODO()
 }