From 3a1921cab0d3611ddc436e4750c78b059d30ed4b Mon Sep 17 00:00:00 2001 From: navazjm Date: Fri, 16 Dec 2022 17:36:37 -0600 Subject: [PATCH] updated rebase confirmation message --- pkg/i18n/english.go | 2 +- pkg/integration/tests/branch/rebase.go | 2 +- pkg/integration/tests/branch/rebase_and_drop.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index e152b62a4..f7b402c0d 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -851,7 +851,7 @@ func EnglishTranslationSet() TranslationSet { GlobalTitle: "Global Keybindings", ConflictsResolved: "all merge conflicts resolved. Continue?", RebasingTitle: "Rebasing", - ConfirmRebase: "Are you sure you want to rebase '{{.checkedOutBranch}}' onto '{{.selectedBranch}}'?", + ConfirmRebase: "Are you sure you want to rebase '{{.checkedOutBranch}}' on top of '{{.selectedBranch}}'?", ConfirmMerge: "Are you sure you want to merge '{{.selectedBranch}}' into '{{.checkedOutBranch}}'?", FwdNoUpstream: "Cannot fast-forward a branch with no upstream", FwdNoLocalUpstream: "Cannot fast-forward a branch whose remote is not registered locally", diff --git a/pkg/integration/tests/branch/rebase.go b/pkg/integration/tests/branch/rebase.go index efaa07c88..f894c42cb 100644 --- a/pkg/integration/tests/branch/rebase.go +++ b/pkg/integration/tests/branch/rebase.go @@ -24,7 +24,7 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{ input.PressKeys(keys.Branches.RebaseBranch) assert.InConfirm() - assert.MatchCurrentViewContent(Contains("Are you sure you want to rebase 'first-change-branch' onto 'second-change-branch'?")) + assert.MatchCurrentViewContent(Contains("Are you sure you want to rebase 'first-change-branch' on top of 'second-change-branch'?")) input.Confirm() assert.InConfirm() diff --git a/pkg/integration/tests/branch/rebase_and_drop.go b/pkg/integration/tests/branch/rebase_and_drop.go index 853ed692d..5600997b3 100644 --- a/pkg/integration/tests/branch/rebase_and_drop.go +++ b/pkg/integration/tests/branch/rebase_and_drop.go @@ -27,7 +27,7 @@ var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{ input.PressKeys(keys.Branches.RebaseBranch) assert.InConfirm() - assert.MatchCurrentViewContent(Contains("Are you sure you want to rebase 'first-change-branch' onto 'second-change-branch'?")) + assert.MatchCurrentViewContent(Contains("Are you sure you want to rebase 'first-change-branch' on top of 'second-change-branch'?")) input.Confirm() assert.MatchViewContent("information", Contains("rebasing"))