Skip to content

Commit 2311317

Browse files
committed
resolve merge conflict
1 parent 622de5a commit 2311317

File tree

2 files changed

+393
-85
lines changed
  • plugins
    • amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model
    • core/sdk-codegen/codegen-resources/codewhispererruntime

2 files changed

+393
-85
lines changed

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/model/BuildStepStatus.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ fun mapTransformationPlanApiStatus(apiStatus: TransformationProgressUpdateStatus
1818
TransformationProgressUpdateStatus.FAILED, TransformationProgressUpdateStatus.SKIPPED, TransformationProgressUpdateStatus.PAUSED -> BuildStepStatus.WARNING
1919
TransformationProgressUpdateStatus.AWAITING_CLIENT_ACTION, TransformationProgressUpdateStatus.IN_PROGRESS -> BuildStepStatus.WORKING
2020
TransformationProgressUpdateStatus.UNKNOWN_TO_SDK_VERSION -> BuildStepStatus.ERROR
21+
TransformationProgressUpdateStatus.SKIPPED -> TODO()
2122
}

0 commit comments

Comments
 (0)