From ea73065c26acfc5ed7a0c90c0b043f4693986bf8 Mon Sep 17 00:00:00 2001 From: mitchell Date: Wed, 31 Jul 2024 09:41:17 -0400 Subject: [PATCH] Add back mistakenly deleted locale message. --- internal/locale/locales/en-us.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/internal/locale/locales/en-us.yaml b/internal/locale/locales/en-us.yaml index d6e247a4e1..f96a2087e8 100644 --- 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: