Merge pull request #3423 from ActiveState/mitchell/dx-2970

Add back mistakenly deleted locale message.
ActiveState · Jul 31, 2024 · 12d84fa · 12d84fa
2 parents d661c98 + ea73065
commit 12d84fa
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/internal/locale/locales/en-us.yaml b/internal/locale/locales/en-us.yaml
@@ -1534,6 +1534,10 @@ err_main_jwt:
     State Tool could not obtain an authentication token from its internal service.
     Please try again or contact support if this issue persists.
     Error received: {{.V0}}
+err_pull_no_common_parent:
+  other: |
+    The local commit ID [NOTICE]{{.V0}}[/RESET] and latest remote commit ID [NOTICE]{{.V1}}[/RESET] have no common parent.
+    To review your project history run '[ACTIONABLE]state history[/RESET]'.
 refresh_runtime_uptodate:
   other: Your runtime is already up to date.
 warn_additional_requirements: